diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:16:46 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-12 01:50:01 +0100 |
commit | e06f678462c60f83e45ad32328f4633390983341 (patch) | |
tree | 249cb914bbaa661dc63b806b90dd1211f3990fbc | |
parent | 63ddbee7d0c3bdfaf34cce3950c1a80fb97602c8 (diff) |
git-debrebase: merge: test conflict: Test resolution via patch
This is a really horrible way to do things. We need a better
way to let the user help resolve this kind of merge.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | tests/tests/gdr-merge-conflicts | 51 |
1 files changed, 39 insertions, 12 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 12e7055..71be280 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -91,6 +91,7 @@ git checkout master git reset --hard master-before-merge t-merge-conflicted-stripping-conflict-markers other docs/README +t-git-debrebase stitch : ----- expect failure ----- @@ -101,22 +102,48 @@ t-git-debrebase wreckage-after -: ----- resolve the conflict ----- +: ===== 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 +quilt_faff_before () { + git checkout -b fix$1 debrebase/wreckage/merged-patchqueue + QUILT_PATCHES=debian/patches quilt push -a +} +quilt_faff_after () { + 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 +} -git checkout master +: ----- badly ----- + +quilt_faff_before 1 +quilt_faff_after + +t-expect-fail E:'upstream files are not the same' \ +t-git-debrebase + +t-git-debrebase scrap +no-wreckage + +: ----- well ----- + +t-expect-fail F:'docs/README' \ +t-git-debrebase +wreckage-after + +quilt_faff_before 2 +git checkout master docs/README +git reset docs/README +quilt_faff_after + +t-git-debrebase -#t-git-debrebase -#t-gdr-good laundered +t-gdr-good laundered t-ok |