[SVN-2685] Move + Merge => lose modifications

• Type: Bug
• Status: Reopened
• Priority: Critical
• Resolution: Unresolved
• Affects Version/s: trunk
• Fix Version/s: 1.12.0
• Component/s: libsvn_client
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 28/Dec/06 10:47
• Updated: 02/Nov/18 06:43

Description

If you move a folder in TRUNK, and merge this move in a BRANCH, svn will copy
the files from TRUNK, and not move (relatively) the files from BRANCH.

Which means you lose all modifications in BRANCH.
I already lost many modifications because of this "feature" :\
--
Added : /TRUNK/TOMOVE/test.txt(Copy from path: /TRUNK/test.txt
Deleted : /TRUNK/test.txt
=> Merge
Added : /BRANCH/TOMOVE(Copy from path: /TRUNK/TOMOVE
Deleted : /BRANCH/test.txt
--

Original issue reported by ozonegrif

Issue Links

• depends upon: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
• is blocked by: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts