D2713: tests: .hg/merge is a directory, so use `test -d`
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Mar 7 19:07:44 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This part of test-rebase-interrupts.t would have passed before the fix
in https://phab.mercurial-scm.org/rHGa580b2d65ded988da1b06e4300d05dcb0b95b352 (rebase: make sure merge state is cleaned up for no-op
rebases (issue5494), 2017-05-18).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2713
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
@@ -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
- [1]
+ $ test -d .hg/merge
+ [1]
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list