Re: svn merge vs svnmerge.py

Henrik Sundberg wrote:
...
> Is svn merge as easy/safe to use as svnmerge.py?

We have our own (Python) merge code which works quite well
with subversion 1.4.6.

I tested merge tracking before upgrading to subversion 1.5.2.
All worked fine in my test cases.

When I tried to use it IRL, nothing worked.

I am getting the error message

svn: Cannot reintegrate from '<URL>' yet:
Some revisions have been merged under it that have not been merged
into the reintegration target; merge them first, then retry.

on plain vanilla "branch from trunk" / "change a file in branch"
"commit change into branch" / "svn merge --reintegrate <branch URL>"
operations.

If I delete the "svn:mergeinfo" property from all subtrees
(which partially defeats the purpose of course), it works slightly
better, but I am still getting strange errors frequently, such as
merge conflicts on the "svn:mergeinfo" property itself!

IMHO, merge tracking does not work under practical conditions yet.

I guess it will be useless at least for us until

http://subversion.tigris.org/issues/show_bug.cgi?id=3128

gets fixed.

Carsten.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-10 22:31:58 CEST