[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Branching / Merging Help

From: Bob Hiestand <bob.hiestand_at_gmail.com>
Date: 2007-05-24 17:57:45 CEST

On 5/22/07, Neil Sheth <nsheth@gmail.com> wrote:
> Ok, I did a test where I first merged the latest trunk into the
> branch, and then merged the branch back into the trunk. The example
> would be:
>
> (while in working copy of branch)
> svn merge -r 341:405 http://svn.example.com/repos/calc/trunk
> (commit this as rev 406, and switch to working copy of trunk)
> svn merge -r 341:406 http://svn.example.com/repos/calc/branches/my-calc-branch
>
> Doing this, I only see the changes in the branch - I don't see it
> "duplicating" the trunk changes.
>
> Does this sound correct, as to how I should be using the
> branching/merging mechanism? Thanks for the help!

Neil,

  While your merge worked out in test, the second merge should have
been (on one line):

  svn merge -r http://svn.example.com/repos/calc/trunk@405
http://svn.example.com/repos/calc/branches/my-calc-branch@406

  That is, since you've previously updated the branch to match the
current trunk (plus the branch changes), the branch-specific changes
are now just the difference between trunk and the branch.

Thank you,

bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu May 24 17:58:08 2007

This is an archived mail posted to the Subversion Users mailing list.