Mercurial > public > mercurial-scm > hg-stable

diff tests/test-histedit-non-commute.t @ 21947:b081decd9062 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add parenthesis around "no more unresolved files" message This message may be confused with an error message. Adding parenthesis around it will make it more recognisable as an informative message.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 26 Jul 2014 03:32:49 +0200
parents e4f451c8c05c
children 477e76936b1d
line wrap: on
line diff
--- a/tests/test-histedit-non-commute.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-histedit-non-commute.t	Sat Jul 26 03:32:49 2014 +0200
@@ -154,7 +154,7 @@
 fix up
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
@@ -168,7 +168,7 @@
 just continue this time
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -241,7 +241,7 @@
 
   $ echo 'I can haz no commute' > e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   merging e
@@ -251,7 +251,7 @@
 second edit also fails, but just continue
   $ hg revert -r 'p1()' e
   $ hg resolve --mark e
-  no more unresolved files
+  (no more unresolved files)
   $ hg histedit --continue 2>&1 | fixbundle
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved