Talk:Svnmerge.py

From SubversionWiki
Jump to navigation Jump to search
The printable version is no longer supported and may have rendering errors. Please update your browser bookmarks and please use the default browser print function instead.

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:

Tobu 08:40, 30 March 2007 (PDT)