diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-11 20:26:41 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:26:19 +0100 |
| commit | 5ad9edffc1e0658f287b45feccbd7c97e0bfd412 (patch) | |
| tree | d0afb5f51ebac1469e5f71e78743f01c19f21d71 /tests/tests/gdr-merge-conflicts | |
| parent | a31d506d5ba29726b661ecd40092c8fbebfa865f (diff) | |
git-debrebase: merge: New record-resolved-merge subcommand, WIP
Right now this seems to be able to generate some commit, but
it doesn't know how to record it.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/gdr-merge-conflicts')
| -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 |