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 two bugs:

• http://subversion.tigris.org/issues/show_bug.cgi?id=2685
• http://subversion.tigris.org/issues/show_bug.cgi?id=898

Tobu 08:40, 30 March 2007 (PDT)