| title: | PATCHv3 2 6 Add a rename D F conflict tes |
|
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 Im submitting in the form of a testsuite
addition. Hes 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. Im 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 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
create mode 100755 t/t3508-cherry-pick-merge-df.sh
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 @@
+#!/bin/sh
+
+test_description=Test cherry-pick with directory/file conflicts
+. ./test-lib.sh
+
+test_expect_success Setup rename across paths each below D/F conflicts
+ mkdir a &&
+ touch a/f &&
+ git add a &&
+ git commit -m "a" &&
+
+ mkdir b &&
+ ln -s ../a b/a &&
+ git add b &&
+ git commit -m "b" &&
+
+ git checkout -b branch &&
+ rm b/a &&
+ mv a b/ &&
+ ln -s b/a a &&
+ git add . &&
+ git commit -m "swap" &&
+
+ 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
+
+
+test_done
--
1.7.1.1.10.g2e807
--
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
|
