git-debrebase: merge: New record-resolved-merge subcommand, WIP

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

diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts
index ab57a1e35b73dbb17ef87d5875afa2e4dc4b3379..420495a711ecb9736e7bfb338704c9119c40a8dc 100755 (executable)
--- a/tests/tests/gdr-merge-conflicts
+++ b/tests/tests/gdr-merge-conflicts
@@ -95,4 +95,23 @@ t-git-debrebase
 
 wreckage-after
 
 
 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
 t-ok