X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgdr-merge-conflicts;h=420495a711ecb9736e7bfb338704c9119c40a8dc;hp=48ed991eae18e697111edbc1d252ae80677132c4;hb=5ad9edffc1e0658f287b45feccbd7c97e0bfd412;hpb=ca84cb09d15eade6d18c8eba1c6a3bd8c42b1f28

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 48ed991e..420495a7 100755
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -10,6 +10,16 @@ t-setup-import gdr-convert-gbp-noarchive
 
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
+wreckage-before () {
+	junkref=refs/debrebase-wreckage/junk
+	git update-ref $junkref v2.1
+}
+
+wreckage-after () {
+	test '' = "$(t-git-get-ref-exact $junkref)"
+	git for-each-ref refs/debrebase-wreckage | egrep .
+}
+
 : ----- prepare the baseline -----
 
 cd $p
@@ -50,15 +60,12 @@ dch -a 'Merge, only conflict was in debian/changelog'
 t-dch-r-rune dch
 git commit -a --amend --no-edit
 
-junkref=refs/debrebase-wreckage/junk
-git update-ref $junkref v2.1
+wreckage-before
 
 t-expect-fail F:'divergent anchors' \
 t-git-debrebase
 
-test '' = "$(t-git-get-ref-exact $junkref)"
-
-git for-each-ref refs/debrebase-wreckage | egrep .
+wreckage-after
 
 : ===== late failure in apply =====
 
@@ -81,9 +88,30 @@ t-merge-conflicted-stripping-conflict-markers other docs/README
 
 : ----- expect failure -----
 
+wreckage-before
+
 t-expect-fail F:'docs/README' \
 t-git-debrebase
 
-# xxx want to check wrecknotes appear
+wreckage-after
+
+: ----- 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
+
+git checkout master
+
+#t-git-debrebase
+#t-gdr-good laundered
 
 t-ok