diff options
Diffstat (limited to 'tests/tests')
-rwxr-xr-x | tests/tests/gdr-merge-conflicts | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index ab57a1e..420495a 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -95,4 +95,23 @@ t-git-debrebase 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 |