You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@subversion.apache.org by "Stefan Sperling (JIRA)" <ji...@apache.org> on 2018/08/10 12:11:00 UTC
[jira] [Commented] (SVN-4694) Unresolvable tree conflict when
cherrypicking a file-edit after file was moved on source branch
[ https://issues.apache.org/jira/browse/SVN-4694?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16576192#comment-16576192 ]
Stefan Sperling commented on SVN-4694:
--------------------------------------
Note that the above fix is incomplete: It makes cases work where files were renamed or moved to a different directory. However, cases where a file is moved along with a moved parent directory are not yet handled.
> Unresolvable tree conflict when cherrypicking a file-edit after file was moved on source branch
> -----------------------------------------------------------------------------------------------
>
> Key: SVN-4694
> URL: https://issues.apache.org/jira/browse/SVN-4694
> Project: Subversion
> Issue Type: Improvement
> Affects Versions: 1.10.0-alpha3
> Reporter: Johan Corveleyn
> Assignee: Stefan Sperling
> Priority: Major
>
> The following tree conflict can not be resolved automatically. The test test_cherry_pick_post_move_edit in libsvn_client/conficts-test.c was added for this (currently marked XFail).
> {quote}
> In r1, create directory A with file mu:
> Changed paths:
> A /A
> A /A/mu
> In r2, directory A is copied to A1 (branched):
> Changed paths:
> A /A1 (from /A:1)
> In r3, A/mu is moved:
> Changed paths:
> D /A/mu
> A /A/mu-moved (from /A/mu:2)
> In r4, A/mu-moved is edited:
> Changed paths:
> M /A/mu-moved
> If we now want to cherry-pick r4 from /A to a working copy of /A1, we get a tree conflict because mu-moved is missing. The relevant move we need to resolve this happened on /A, in r3.
> {quote}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)