Re: Merging Branches

This is one area in the book that I think causes confusion. Obviously, correct me if I'm wrong but my understanding of the book example for merging shows:

1. I (not sure if name is given for this person) create a branch from the trunk (http://svnbook.red-bean.com/svnbook/book.html#svn-ch-4-sect-2.1)
2. Sally makes changes to some files on the truck (http://svnbook.red-bean.com/svnbook/book.html#svn-ch-4-sect-2.2)
3. I merge some of the change that Sally made in to my branch (http://svnbook.red-bean.com/svnbook/book.html#svn-ch-4-sect-3.1)
4. I merge my changes (http://svnbook.red-bean.com/svnbook/book.html#svn-ch-4-sect-4.1)

However, the information in the book for (4) doesn't seem to account for the merge from trunk to branch performed in (3).

Regardless of this, I must say the book is awesome and I appreciate the work you all put in to it! Your attention to documentation is, in my opinion, a major reason subversion is superior to CVS.

Oh, and Ben, thanks for update on the merging feature - especially noting this is similar to CVS behavior.

Thanks,
Bob

>>> Ben Collins-Sussman <sussman@collab.net> 09/03/04 09:51AM >>>
On Fri, 2004-09-03 at 09:47, Jacob Atzen wrote:

> I'm no expert but it seems like your suggestion number 1 is "The Right
> Way"(tm). I assume you've read the books chapter on merging?
>
> <http://svnbook.red-bean.com/svnbook/ch04s03.html>
>
> Your number 2 might work if you haven't changed the lines containing
> your trunk to branch merges:
>
> When patching a file, Subversion typically notices if the file
> already has the change, and does nothing.

Congrats, Russ. You've just discovered why Subversion really needs a
merge-tracking feature. :-)

If Subversion were anything like clearcase, you'd simply say, "hey,
please merge my branch back into trunk", and the system would
automatically know which changes already existed in both branch and
trunk, and skip over them for you.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 3 18:26:33 2004