on Thu Dec 06 2007, David Abrahams <dave-AT-boost-consulting.com> wrote:
on Thu Dec 06 2007, Eric Niebler <eric-AT-boost-consulting.com> wrote:
Have you tried it with regular svn merge? Once you get regular svn merge doing exactly what you want, presumably svnmerge.py would use a very similar set of arguments.
My point is that I can't use svnmerge.py because merge tracking hasn't been enabled on the release branch. Nobody can use svnmerge.py until someone (probably you) runs svnmerge.py init on branches/release.
Two new points of interest, from someone who knows a lot more about these things than I do (http://article.gmane.org/gmane.comp.version-control.subversion.trac.devel/29...):
1. You may not want to hold your breath for merge tracking to appear in SVN; it might not be included in 1.5
I did a little research on this: http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=133179 is quite revealing.
2. It's quite possible that svnmerge.py isn't the best approach for merging. Local use of Mercurial or Git (or svk?) might work better.
I'm certainly going to try svk when I get a chance. -- Dave Abrahams Boost Consulting http://www.boost-consulting.com