Talk:Svnmerge.py: Difference between revisions
Jump to navigation
Jump to search
(ask if this fixes renames) |
No edit summary |
||
| (4 intermediate revisions by 2 users not shown) | |||
| Line 1: | Line 1: | ||
Hi, does this solve the bug in this merge + rename scenario: | 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 | * rename /branches/b1/file into /branches/b1/file.renamed | ||
edit /trunk/file | * edit /trunk/file | ||
merge back /branches/b1 into /trunk | * 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. | /trunk/file has been renamed into /trunk/file.renamed, but the changes done to /trunk/file have been lost. | ||
See these | See these descriptions: | ||
* http://subversion.tigris.org/issues/show_bug.cgi?id=2685 | * http://subversion.tigris.org/issues/show_bug.cgi?id=2685 | ||
* http:// | * http://svn.collab.net/repos/svn/trunk/www/merge-tracking/requirements.html#rename-tracking | ||
[[User:Tobu|Tobu]] 08:40, 30 March 2007 (PDT) | [[User:Tobu|Tobu]] 08:40, 30 March 2007 (PDT) | ||
Latest revision as of 17:54, 2 May 2007
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)