X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;h=1f3f09e0d1a6ec3336d0ed694b99be4c1e7f4128;hb=50b6d1fa7bd440dcc7ef9d1803aa8e71e388361f;hp=59dec9720b18e0fb5fcbe6813f1a11da4c028386;hpb=d83b380941520c668a712b0b936513373bd44278;p=dgit.git

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 59dec972..1f3f09e0 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -3,12 +3,12 @@ set -e
 autoimport=
 . tests/lib
 
-t-dependencies NO-DGIT GDR
+t-dependencies NO-DGIT GDR quilt
 
 t-tstunt-parsechangelog
 t-setup-import gdr-convert-gbp-noarchive
 
-export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
+t_gdr_xopts+=' --experimental-merge-resolution'
 
 wreckage-before () {
 	junkref=refs/debrebase/wreckage/junk
@@ -20,6 +20,12 @@ wreckage-after () {
 	git for-each-ref refs/debrebase/wreckage | egrep .
 }
 
+no-wreckage () {
+	if git for-each-ref refs/debrebase/wreckage | egrep .; then
+		fail wreckage
+	fi
+}
+
 : ----- prepare the baseline -----
 
 cd $p
@@ -77,7 +83,7 @@ git commit -m 'other-upstream-conflict' docs/README
 
 t-git-debrebase quick
 
-if git for-each-ref refs/debrebase/wreckage | egrep .; then fail wreck; fi
+no-wreckage
 
 : ----- make the merge -----
 
@@ -85,6 +91,7 @@ git checkout master
 git reset --hard master-before-merge
 
 t-merge-conflicted-stripping-conflict-markers other docs/README
+t-git-debrebase stitch
 
 : ----- expect failure -----
 
@@ -95,23 +102,48 @@ t-git-debrebase
 
 wreckage-after
 
-: ----- resolve the conflict -----
+: ===== resolve the conflict =====
 
 # omg
-git checkout debrebase/wreckage/merged-patchqueue
-QUILT_PATCHES=debian/patches quilt push -a
-QUILT_PATCHES=debian/patches quilt refresh
-git add debian/patches
-git commit -m FIX
-git reset --hard
-git clean -xdff
 
-t-expect-fail F:todo \
-t-git-debrebase record-resolved-merge
+quilt_faff_before () {
+	git checkout -b fix$1 debrebase/wreckage/merged-patchqueue
+	QUILT_PATCHES=debian/patches quilt push -a
+}
+quilt_faff_after () {
+	QUILT_PATCHES=debian/patches quilt refresh
+	git add debian/patches
+	git commit -m FIX
+	git reset --hard
+	git clean -xdff
+	t-git-debrebase record-resolved-merge
+	git checkout master
+}
 
-git checkout master
+: ----- badly -----
+
+quilt_faff_before 1
+quilt_faff_after
+
+t-expect-fail E:'upstream files are not the same' \
+t-git-debrebase
+
+t-git-debrebase scrap
+no-wreckage
+
+: ----- well -----
+
+t-expect-fail F:'docs/README' \
+t-git-debrebase
+wreckage-after
+
+quilt_faff_before 2
+git checkout master docs/README
+git reset docs/README
+quilt_faff_after
+
+t-git-debrebase
 
-#t-git-debrebase
-#t-gdr-good laundered
+t-gdr-good laundered
 
 t-ok