tests: add test for issue 5494 but with --collapse
This was not fixed, so the test case currently demonstrates the
breakage.
Differential Revision: https://phab.mercurial-scm.org/D2714
--- a/tests/test-rebase-interruptions.t Wed Mar 07 10:55:57 2018 -0800
+++ b/tests/test-rebase-interruptions.t Wed Mar 07 11:00:17 2018 -0800
@@ -463,3 +463,23 @@
$ hg resolve --list
$ test -d .hg/merge
[1]
+Now try again with --collapse
+ $ hg unbundle -q .hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
+ $ hg rebase -s 2 -d 1 --noninteractive --collapse
+ rebasing 2:fdaca8533b86 "b" (tip)
+ merging a
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
+ unresolved conflicts (see hg resolve, then hg rebase --continue)
+ [1]
+ $ echo a > a
+ $ echo c >> a
+ $ hg resolve --mark a
+ (no more unresolved files)
+ continue: hg rebase --continue
+ $ hg rebase --continue
+ rebasing 2:fdaca8533b86 "b" (tip)
+ saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
+BROKEN: the merge state was not cleared
+ $ hg resolve --list
+ R a
+ $ test -d .hg/merge