Details
-
Type:
Improvement
-
Status: Open
-
Priority:
Major
-
Resolution: Unresolved
-
Affects Version/s: 1.10.0-alpha3
-
Fix Version/s: None
-
Component/s: None
-
Labels:None
Description
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).
In r1, create directory A with file mu:
Changed paths:
A /A
A /A/muIn 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-movedIf 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.