git-debrebase: merge: test conflict: Break out no-wreckage

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

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index e556db458d1afa18058ec3fa1fbf27ecee8acde6..f0abea79572c7ce9fec02b7a2537081814aeeac4 100755 (executable)
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -11,13 +11,19 @@ t-setup-import gdr-convert-gbp-noarchive
 export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1
 
 wreckage-before () {
-       junkref=refs/debrebase-wreckage/junk
+       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 .
+       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 -----
@@ -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 -----
 
@@ -88,9 +94,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