git-debrebase: merge: Actually record merge resolutions

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

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index 467dc6ad342d27f4dbd6e453e8e6f9bb987fce05..12e7055aaa2f59f8daec382d885b6231af641b30 100755 (executable)
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -10,6 +10,22 @@ 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 .
+}
+
+no-wreckage () {
+       if git for-each-ref refs/debrebase/wreckage | egrep .; then
+               fail wreckage
+       fi
+}
+
 : ----- prepare the baseline -----
 
 cd $p
@@ -50,20 +66,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
 
-git rev-parse $junkref
-
-t-expect-fail F:'divergent anchors' \
-t-git-debrebase --save-wreckage
-
-test '' = "$(t-git-get-ref-exact $junkref)"
-
-git for-each-ref refs/debrebase-wreckage | egrep .
+wreckage-after
 
 : ===== late failure in apply =====
 
@@ -75,6 +83,8 @@ git commit -m 'other-upstream-conflict' docs/README
 
 t-git-debrebase quick
 
+no-wreckage
+
 : ----- make the merge -----
 
 git checkout master
@@ -84,9 +94,29 @@ 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-git-debrebase record-resolved-merge
+
+git checkout master
+
+#t-git-debrebase
+#t-gdr-good laundered
 
 t-ok