Mercurial > hg

comparison tests/test-rebase-interruptions.t @ 36776:c164a3a282c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: .hg/merge is a directory, so use `test -d` This part of test-rebase-interrupts.t would have passed before the fix in a580b2d65ded (rebase: make sure merge state is cleaned up for no-op rebases (issue5494), 2017-05-18). Differential Revision: https://phab.mercurial-scm.org/D2713
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 07 Mar 2018 10:55:57 -0800
parents 4441705b7111
children 66c569e57c70
comparison
equal deleted inserted replaced
36775:6dab3bdb1f00 36776:c164a3a282c1
459 $ hg rebase --continue 459 $ hg rebase --continue
460 rebasing 1:fdaca8533b86 "b" 460 rebasing 1:fdaca8533b86 "b"
461 note: rebase of 1:fdaca8533b86 created no changes to commit 461 note: rebase of 1:fdaca8533b86 created no changes to commit
462 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg 462 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
463 $ hg resolve --list 463 $ hg resolve --list
464 $ test -f .hg/merge 464 $ test -d .hg/merge
465 [1] 465 [1]