Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: adapt to upstream message change
authorPierre-Yves David <pierre-yves.david@fb.com>
Tue, 29 Jul 2014 17:15:01 -0700
changeset 1003 574315ec19c2
parent 1002 195642c1520b
child 1004 808a33826700
test: adapt to upstream message change A message gained parenthesis in 3.1 we reflect than in the test.
tests/test-evolve.t file | annotate | diff | comparison | revisions
tests/test-stabilize-conflict.t file | annotate | diff | comparison | revisions
tests/test-stabilize-result.t file | annotate | diff | comparison | revisions 
--- a/tests/test-evolve.t	Thu Jul 24 12:02:53 2014 -0700
+++ b/tests/test-evolve.t	Tue Jul 29 17:15:01 2014 -0700
@@ -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	Thu Jul 24 12:02:53 2014 -0700
+++ b/tests/test-stabilize-conflict.t	Tue Jul 29 17:15:01 2014 -0700
@@ -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	Thu Jul 24 12:02:53 2014 -0700
+++ b/tests/test-stabilize-result.t	Tue Jul 29 17:15:01 2014 -0700
@@ -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
evolve