diff options
| -rwxr-xr-x | tests/tests/gdr-merge-conflicts | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/tests/tests/gdr-merge-conflicts b/tests/tests/gdr-merge-conflicts index 48ed991..e556db4 100755 --- a/tests/tests/gdr-merge-conflicts +++ b/tests/tests/gdr-merge-conflicts @@ -10,6 +10,16 @@ t-setup-import gdr-convert-gbp-noarchive export GIT_DEBREBASE_EXPERIMENTAL_MERGE=1 +wreckage-before () { + 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 . +} + : ----- prepare the baseline ----- cd $p @@ -50,15 +60,12 @@ dch -a 'Merge, only conflict was in debian/changelog' t-dch-r-rune dch git commit -a --amend --no-edit -junkref=refs/debrebase-wreckage/junk -git update-ref $junkref v2.1 +wreckage-before t-expect-fail F:'divergent anchors' \ t-git-debrebase -test '' = "$(t-git-get-ref-exact $junkref)" - -git for-each-ref refs/debrebase-wreckage | egrep . +wreckage-after : ===== late failure in apply ===== |