I'm fairly new to svn and I'm trying to get my head around how svn handles 
branches and merging.  I've done a lot of reading on this, I've been able to 
work my way through merging changes from TRUNK to a BRANCH but I still do not 
quite understand it.  If someone could start by explaining what happens in this 
scenario that would help.

First, I used this command to see the differences between my BRANCH and TRUNK
  svn diff --summarize --old http://repo/proj/branches/1/  --new 
http://repo/proj/trunk/

Second, based on the summary, I merged differences from TRUNK into BRANCH and 
commited the BRANCH.

Third, I re-ran the command to see if there were any changes I missed.
  svn diff --summarize --old http://repo/proj/branches/1/  --new 
http://repo/proj/trunk/

To my surprise it gave me the same summary.  After merging the changes into the 
BRANCH and committing the changes, I expected there to be no changes.  So why 
does it give me the same summary?

Reply via email to