Search code examples
svnmergerebasetree-conflict

How exactly to do a Subversion pre-1.5 style merge?

I have to deal with Subversion 1.4 merges at the moment and have found this answer to a question, which exactly describes my problem. The actual question deals with git-style rebase and merge problems with SVN which produce tree conflicts. It includes the following recommendation:

[...] instead of range-merging the branch to a working copy that points to the trunk, you want to merge "FROM trunk@HEAD TO branch@HEAD" with the working copy pointing to trunk. In essence:

"Give me all the changes I'd need to make trunk identical to branch".

Now I wonder how to actually do that merge with SVN, since svn merge only merges to the working directory. Is there a typo in the original answer or am I missing something?

Solution
    1. After svn merge you need to svn ci, and the merge is committed to the branch
    2. With Subversion 1.4, the best way to handle merging is with svnmerge.py