[
https://issues.apache.org/jira/browse/SVN-2685?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15861225#comment-15861225
]
Stefan Sperling commented on SVN-2685:
--------------------------------------
I am declaring this issue as fixed by the new conflict resolver in 1.10.
https://subversion.apache.org/docs/release-notes/1.10.html#conflict-resolver
If the new resolver does not fix this problem for you, please send a detailed
bug report to the users@ list, and we can open a new issue for any such
specific problem after consideration.
> Move + Merge => lose modifications
> ----------------------------------
>
> Key: SVN-2685
> URL: https://issues.apache.org/jira/browse/SVN-2685
> Project: Subversion
> Issue Type: Bug
> Components: libsvn_client
> Affects Versions: trunk
> Reporter: Subversion Importer
> Priority: Critical
> Labels: tree-conflicts
> Fix For: 1.10.0
>
>
> {noformat:nopanel=true}
> 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
> --
> {noformat}
> Original issue reported by *ozonegrif*
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
