| title: | Re PATCHv3 2 6 Add a rename D F conflict |
|
On Wed, Jul 7, 2010 at 3:26 PM, Junio C Hamano <gitster@xxxxxxxxx wrote:
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...
It works with the resolve strategy. I could add a testcase for it in
the next resend, though using the --strategy option will make the
series depend on master and make it no longer apply to maint. Is that
an issue?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at rel="nofollow" vger.kernel.org/majordomo-info.html vger.kernel.org/majordomo-info.html
|
