Mercurial > hg > hg-git

changeset 724:9f1dd4cb15f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix breakage caused by Mercurial changes Mercurial commit e4f451c8c05c added a new message to `hg resolve` with no more unresolved files.
author Siddharth Agarwal <sid0@fb.com>
date Mon, 19 May 2014 19:52:22 -0700 (2014-05-20)
parents 47d743e06852
children 91b621c6ba9a
files tests/test-conflict-1.t tests/test-conflict-2.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-conflict-1.t
+++ b/tests/test-conflict-1.t
@@ -23,7 +23,7 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 resolve using first parent
   $ echo C > afile
-  $ hg resolve -m afile
+  $ hg resolve -m afile | egrep -v '^no more unresolved files$' || true
   $ hg ci -m "merge to C"
 
   $ hg log --graph --style compact | sed 's/\[.*\]//g'
--- a/tests/test-conflict-2.t
+++ b/tests/test-conflict-2.t
@@ -23,7 +23,7 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 resolve using second parent
   $ echo B > afile
-  $ hg resolve -m afile
+  $ hg resolve -m afile | egrep -v '^no more unresolved files$' || true
   $ hg ci -m "merge to B"
 
   $ hg log --graph --style compact | sed 's/\[.*\]//g'