Mercurial > hg > evolve

changeset 1099:574315ec19c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: adapt to upstream message change A message gained parenthesis in 3.1 we reflect than in the test.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 29 Jul 2014 17:15:01 -0700
parents 195642c1520b
children 808a33826700
files tests/test-evolve.t tests/test-stabilize-conflict.t tests/test-stabilize-result.t
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -539,7 +539,7 @@
   7:a5bfd90a2f29 stable
   $ echo 3 > 1
   $ hg resolve -m 1
-  no more unresolved files
+  (no more unresolved files)
   $ hg graft --continue -O
   grafting revision 7
   $ glog --hidden
--- a/tests/test-stabilize-conflict.t
+++ b/tests/test-stabilize-conflict.t
@@ -164,7 +164,7 @@
   reverting babar
   $ safesed 's/dix/ten/' babar
   $ hg resolve --all -m
-  no more unresolved files
+  (no more unresolved files)
   $ hg evolve --continue
   grafting revision 5
   $ hg resolve -l
--- a/tests/test-stabilize-result.t
+++ b/tests/test-stabilize-result.t
@@ -95,7 +95,7 @@
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -m a
-  no more unresolved files
+  (no more unresolved files)
   $ hg evolve --continue
   grafting revision 5