Talk:Svnmerge.py

Hi, does this solve the bug in this merge + rename scenario:

• branch /trunk into /branches/b1
• rename /branches/b1/file into /branches/b1/file.renamed
• edit /trunk/file
• merge back /branches/b1 into /trunk

/trunk/file has been renamed into /trunk/file.renamed, but the changes done to /trunk/file have been lost.

See these descriptions:

• http://subversion.tigris.org/issues/show_bug.cgi?id=2685
• http://svn.collab.net/repos/svn/trunk/www/merge-tracking/requirements.html#rename-tracking

Tobu 08:40, 30 March 2007 (PDT)

Can someone help me understand this error?

$ svnmerge.py integrated
svnmerge: unable to determine oldest revision for URL "svn+ssh://bantha/usr/local/svn/sandbox/trunk"

I can merge fine, but the integrated and rollback options always give me that error. I've tried passing it various values for path but same problem. Any tips?