newren@xxxxxxxxx writes: > From: Alexander Gladysh <agladysh@xxxxxxxxx> > > This is a simple testcase where both sides of the rename are paths involved > in (separate) D/F merge conflicts > > Signed-off-by: Alexander Gladysh <agladysh@xxxxxxxxx> > Signed-off-by: Elijah Newren <newren@xxxxxxxxx> > --- > Copying my additional comments from round 2: > > As noted previously this is simply a testcase Alexander sent to the > list on March 8 which I'm submitting in the form of a testsuite > addition. He's happy to have his testcase added to the testsuite > and/or even submit it himself if that makes more sense -- just let > us know what is wanted. I'm less familiar with format-patch and am; > hopefully this submission comes across with him recorded as the > author. > > t/t3508-cherry-pick-merge-df.sh | 34 ++++++++++++++++++++++++++++++++++ As t3508 is already used elsewhere I'll rename this to 3509, with minor style fixes as well. > diff --git a/t/t3508-cherry-pick-merge-df.sh b/t/t3508-cherry-pick-merge-df.sh > new file mode 100755 > index 0000000..646a56d > --- /dev/null > +++ b/t/t3508-cherry-pick-merge-df.sh > @@ -0,0 +1,34 @@ > ... > + touch f1 && > + git add f1 && > + git commit -m "f1" > +' > + > +test_expect_failure 'Cherry-pick succeeds with rename across D/F conflicts' ' > + git checkout master && > + git cherry-pick branch > +' This is curious. "branch" only adds a totally unrelated path to its parent, and picking it should be trivial. I wonder what it does here if we used the resolve strategy... -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html