X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge;h=78b79e9b9bc74e1ba47c6d77a49c198b3074e8a5;hb=16f71c0bfd026cafacd9a5fad1404e457ae55b78;hp=b1a215a4890e8241e67693c8a018a10592974729;hpb=79c61ce4926d8bb167fcdc5dd494c667ed4e9fbd;p=dgit.git

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index b1a215a4..78b79e9b 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -3,13 +3,11 @@ set -e
 autoimport=
 . tests/lib
 
-t-dependencies NO-DGIT GDR
+t-dependencies GDR
 
 t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
 
-: 'do a simple test'
-
 cd $p
 
 t-gdr-prep-new-upstream 2.1
@@ -18,12 +16,16 @@ git tag v2.1 upstream
 t-some-changes before
 t-git-debrebase quick
 
+: ----- prepare LH branch -----
+
 git checkout -b other
 t-some-changes other '' -other
 
 echo 'other-conflict' >>debian/zorkmid
 git commit -m 'other-conflict' debian/zorkmid
 
+: ----- prepare RH branch -----
+
 git checkout master
 t-some-changes us-1 '' -us
 t-git-debrebase new-upstream 2.1
@@ -32,18 +34,16 @@ 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
+: ----- introduce a vanilla merge -----
 
-perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid
-
-git add debian/zorkmid
-git commit --no-edit
+t-merge-conflicted-stripping-conflict-markers other debian/zorkmid
 
 t-expect-fail E:'general two-parent merge' \
 t-git-debrebase
 
-export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
+t_gdr_xopts+=' --experimental-merge-resolution'
+
+: ----- expect to be able to merge -----
 
 t-git-debrebase
 t-gdr-good laundered
@@ -59,4 +59,7 @@ t-some-changes after
 t-git-debrebase
 t-gdr-good laundered
 
+t-dgit quilt-fixup
+t-gdr-made-patches
+
 t-ok