Commit 366cb01e authored by durin42's avatar durin42
Browse files

tests: fix output expectations from 3ff09f0fac7a

parent 3ff09f0fac7a
......@@ -91,7 +91,7 @@ Check state of refs after outgoing
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'
......
......@@ -58,14 +58,14 @@ this should fail
$ 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'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment