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

diff --git a/tests/tests/gdr-merge b/tests/tests/gdr-merge
index 07ded5a3..78b79e9b 100755
--- a/tests/tests/gdr-merge
+++ b/tests/tests/gdr-merge
@@ -3,32 +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
 
-: 'set up so t-git-debrebase runs gdr via git'
-
-case "$DGIT_GITDEBREBASE_TEST" in
-''|git-debrebase)	;;
-*)
-	t-tstunt
-	st=$tmp/tstunt/git-debrebase
-	export DGIT_GITDEBREBASE_TEST_REAL="$DGIT_GITDEBREBASE_TEST"
-	cat <<'END' >$st
-#!/bin/sh
-set -x
-exec "$DGIT_GITDEBREBASE_TEST_REAL" "$@"
-END
-	chmod +x $st
-	;;
-esac
-
-DGIT_GITDEBREBASE_TEST='git debrebase'
-
-: 'do a simple test'
-
 cd $p
 
 t-gdr-prep-new-upstream 2.1
@@ -37,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
@@ -51,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
-
-perl -i~ -ne 'print unless m{^(?:\<\<\<|\>\>\>|===)}' debian/zorkmid
+: ----- introduce a vanilla merge -----
 
-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
@@ -78,4 +59,7 @@ t-some-changes after
 t-git-debrebase
 t-gdr-good laundered
 
+t-dgit quilt-fixup
+t-gdr-made-patches
+
 t-ok