Mercurial > hg

comparison tests/test-rebase-interruptions.t @ 36928:9457c395fcbb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: fix issue 5494 also with --collapse Differential Revision: https://phab.mercurial-scm.org/D2759
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 08 Mar 2018 14:17:24 -0800
parents 66c569e57c70
children e9e61fbac787
comparison
equal deleted inserted replaced
36927:17a744c5e270 36928:9457c395fcbb
477 (no more unresolved files) 477 (no more unresolved files)
478 continue: hg rebase --continue 478 continue: hg rebase --continue
479 $ hg rebase --continue 479 $ hg rebase --continue
480 rebasing 2:fdaca8533b86 "b" (tip) 480 rebasing 2:fdaca8533b86 "b" (tip)
481 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg 481 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
482 BROKEN: the merge state was not cleared
483 $ hg resolve --list 482 $ hg resolve --list
484 R a
485 $ test -d .hg/merge 483 $ test -d .hg/merge
484 [1]