chiark / gitweb /
git-debrebase: merge: test suite: test avoiding re-merge of debian/
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 12:48:36 +0000 (13:48 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 14:36:23 +0000 (15:36 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
tests/tests/gdr-merge

index 666672f..a213385 100755 (executable)
@@ -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