Patchwork D2714: tests: add test for issue 5494 but with --collapse

login
register
mail settings
Submitter phabricator
Date March 8, 2018, 6:28 a.m.
Message ID <6afdf282b54490d21621837e5f5e0fa1@localhost.localdomain>
Download mbox | patch
Permalink /patch/29122/
State Not Applicable
Headers show

Comments

phabricator - March 8, 2018, 6:28 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG66c569e57c70: tests: add test for issue 5494 but with --collapse (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2714?vs=6702&id=6723

REVISION DETAIL
  https://phab.mercurial-scm.org/D2714

AFFECTED FILES
  tests/test-rebase-interruptions.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

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