Affects Version/s: 1.10.0-alpha3
Fix Version/s: None
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:
In r2, directory A is copied to A1 (branched):
A /A1 (from /A:1)
In r3, A/mu is moved:
A /A/mu-moved (from /A/mu:2)
In r4, A/mu-moved is edited:
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.