From 75da546e42b202e22aafb7241b9819e51b1d6ea7 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 11 Aug 2018 13:48:36 +0100 Subject: [PATCH] git-debrebase: merge: test suite: test avoiding re-merge of debian/ Signed-off-by: Ian Jackson --- tests/tests/gdr-merge | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge index 666672fa..a213385a 100755 --- a/tests/tests/gdr-merge +++ b/tests/tests/gdr-merge @@ -40,14 +40,25 @@ t-git-debrebase quick git checkout -b other t-some-changes other '' -other +echo 'other-conflict' >>debian/zorkmid +git commit -m 'other-conflict' debian/zorkmid + git checkout master t-some-changes us-1 '' -us t-git-debrebase new-upstream 2.1 t-some-changes us-2 '' -us +echo 'us-conflict' >>debian/zorkmid +git commit -m 'us-conflict' debian/zorkmid t-git-debrebase quick +t-expect-fail E:'Merge conflict in debian/zorkmid' \ git merge other +perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid + +git add debian/zorkmid +git commit --no-edit + t-expect-fail E:'general two-parent merge' \ t-git-debrebase -- 2.30.2