[jira] [Comment Edited] (SVN-2685) Move + Merge => lose modifications

["Johan Corveleyn (JIRA)" <ji...@apache.org>]

    [ https://issues.apache.org/jira/browse/SVN-2685?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16136838#comment-16136838 ] 

Johan Corveleyn edited comment on SVN-2685 at 8/22/17 2:10 PM:
---------------------------------------------------------------

Reopening because the copyfrom after merging a move is now only correct ("branch-relative") if you encounter a tree conflict, and you resolve it with 'move and merge'. In all other cases of merging moves (if you don't encounter a tree conflict, or you resolve it manually in some other way) the copyfrom information will still be "wrong" (pointing to the merge source).


was (Author: jcorvel):
Reopening because the copyfrom after merging a move is now only correct ("branch-relative") if you encounter a tree conflict, and you resolve it with 'move and merge'. In all other cases (if you don't encounter a tree conflict, or you resolve it manually in some other way) the copyfrom information will still be "wrong" (pointing to the merge source).

> 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.4.14#64029)