Re: [PATCHv3 2/6] Add a rename + D/F conflict testcase
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:49:05
newren@gmail.com writes:
From: Alexander Gladysh <redacted> 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 <redacted> Signed-off-by: Elijah Newren <redacted> --- 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.
quoted hunk ↗ jump to hunk
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...