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 .
}
: ----- prepare the baseline -----
t-git-debrebase quick
-if git for-each-ref refs/debrebase-wreckage | egrep .; then fail wreck; fi
+if git for-each-ref refs/debrebase/wreckage | egrep .; then fail wreck; fi
: ----- make the merge -----
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