Re: Merging branches

Joe Drew <hoserhead@woot.net> writes:

> In reading the subversion book, I came across the assertion that in
> order to merge from a branch into the trunk, you need to specify
> revisions because otherwise "it would not only show the addition of your
> branch changes, but also the removal of trunk changes that never
> happened on your branch."

That's not what the book says. The book says that in order to merge a
branch into the trunk, the user should be careful about which two URLs
are compared. The two URLs should *not* be {branch@HEAD, trunk@HEAD}.
That would result in the quoted affect above.

Instead, you should be comparing the URLs {branch@BIRTH, branch@HEAD},
where BIRTH is the revision in which the branch was first created. By
comparing those two URLs, you're creating a composite "patch" which
exactly describes all the changes that happened on the branch.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Sep 29 05:20:49 2003