From SubversionWiki
Revision as of 17:54, 2 May 2007 by Mla (talk | contribs)
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to navigation Jump to search

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)