Patchwork D2713: tests: .hg/merge is a directory, so use `test -d`

login
register
mail settings
Submitter phabricator
Date March 7, 2018, 7:07 p.m.
Message ID <differential-rev-PHID-DREV-3oo3vu6haxczdfrl627o-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/29100/
State Superseded
Headers show

Comments

phabricator - March 7, 2018, 7:07 p.m.
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




To: martinvonz, #hg-reviewers
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
@@ -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]