On 5/6/06, Zsolt <zkoppanylist@intland.com> wrote:
> I'm not sure what you mean but I give you an example.
> - 1-may I make a new-branch (testbr) on a trunk. The file a.java was
> modified on 15-apr.
> - I modify a.java on the trunk on the 2-may.
> - On testbr, a.java IS NOT modified.
> - On 4-may I merge testbr to the trunk.
> If the a.java testbr overwrites a.java on the trunk it has nothing to do
> with merge. The entire content of the branch overwrite the trunk, the
> version control system is just USELESS.
It sounds like you asked svn to apply the differences between the
branch and the trunk to the trunk, when what you should have done was
apply the changes *within* the branch to the trunk. ie:
in a working copy of the trunk:
svn svn merge http://svn.example.com/repos/testbr
http://svn.example.com/repos/trunk
(wrong: will just synch up the working copy with the branch)
svn svn merge -r $START_OF_CHANGES:HEAD
http://svn.example.com/repos/testbr
(right: will merge the changes that happened on the branch)
The FAQ shows how to do this without remembering revision numbers:
http://subversion.tigris.org/faq.html#merge-using-tags
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat May 6 11:11:54 2006