git-debrebase: merge: test suite: test avoiding re-merge of debian/

[dgit.git] / tests / tests / gdr-merge

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 25b2ee0a22f20fe23ce6865c0eee3381bc5ca050..a213385a06de5e44af7a492fbf361d2402bf97fb 100755 (executable)
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -40,32 +40,38 @@ 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
 
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
 t-git-debrebase
+t-gdr-good laundered
+t-git-debrebase
+t-gdr-good laundered
 t-git-debrebase scrap
 
 t-some-changes after
 t-git-debrebase
-
-# xxx want to check that we DTRT if we start out unstitched -
-# xxx should consider our ffq-prev as a parent
-# xxx or should we ?  it's not a parent of the merge is it ?
-# xxx => user should prefer to make merges when stitched ?
-# xxx think about this later
-
-# t-gdr-good laundered
-# xxx ^ this does not work
+t-gdr-good laundered
 
 t-ok