martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY This was not fixed, so the test case currently demonstrates the breakage. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2714 AFFECTED FILES tests/test-rebase-interruptions.t CHANGE DETAILS diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t --- a/tests/test-rebase-interruptions.t +++ b/tests/test-rebase-interruptions.t @@ -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 To: martinvonz, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
