Re: SV: Can't get merge to work as suggested

"Tomas Sandkvist" <tomas.sandkvist@protang.se> writes:

> svn merge c:\svn_repository\projekt_A\trunk\Radtest.txt@59
> c:\svn_repository\projekt_A\branches\branch1\Radtest.txt@53
>
> Now the response is:
>
> U Radtest.txt

This is the most common 'newbie' error with merging. :-)

You DO NOT WANT to compare the 'tip' of each branch!

You want to compare the *base* of the branch with the *tip* of the
branch, and merge that change into you trunk working copy.

If you compare the branch-tip and trunk-tip, that change includes too
many things, some of which you do not want. Yes, it includes your
branch changes, but it also includes the *removal* of the trunk
changes.

The svn book talks about this common misunderstanding. It's the last
section on this page:

   http://svnbook.red-bean.com/html-chunk/ch04s03.html

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 3 19:53:29 2003