Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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`
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 07 Mar 2018 10:55:57 -0800
changeset 36776 c164a3a282c1
parent 36775 6dab3bdb1f00
child 36777 66c569e57c70
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
tests/test-rebase-interruptions.t file | annotate | diff | comparison | revisions 
--- a/tests/test-rebase-interruptions.t	Tue Mar 06 14:29:20 2018 -0800
+++ b/tests/test-rebase-interruptions.t	Wed Mar 07 10:55:57 2018 -0800
@@ -461,5 +461,5 @@
   note: rebase of 1:fdaca8533b86 created no changes to commit
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/fdaca8533b86-7fd70513-rebase.hg
   $ hg resolve --list
-  $ test -f .hg/merge
+  $ test -d .hg/merge
   [1]
mercurial