Mercurial > hg > hg-git

changeset 631:24b80a953f06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix output expectations from 3ff09f0
author Augie Fackler <raf@durin42.com>
date Sun, 15 Dec 2013 15:25:31 -0500
parents 3ff09f0fac7a
children 711baa274f78
files tests/test-outgoing.t tests/test-push.t
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
old mode 100755
new mode 100644
--- a/tests/test-outgoing.t
+++ b/tests/test-outgoing.t
@@ -91,7 +91,7 @@
 this will fail # maybe we should try to make it work
   $ hg outgoing
   comparing with */gitrepo (glob)
-  abort: refs/heads/master changed on the server, please pull and merge before pushing
+  abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing
   [255]
 let's pull and try again
   $ hg pull 2>&1 | grep -v 'divergent bookmark'
--- a/tests/test-push.t
+++ b/tests/test-push.t
@@ -58,14 +58,14 @@
   $ hg push -r master
   pushing to $TESTTMP/gitrepo
   searching for changes
-  abort: refs/heads/master changed on the server, please pull and merge before pushing
+  abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing
   [255]
 
 ... even with -f
   $ hg push -fr master
   pushing to $TESTTMP/gitrepo
   searching for changes
-  abort: refs/heads/master changed on the server, please pull and merge before pushing
+  abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing
   [255]
 
   $ hg pull 2>&1 | grep -v 'divergent bookmark'