facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-04 03:06:30 +03:00
Code Issues Projects Releases Wiki Activity

tests: fix output expectations from 3ff09f0

Browse Source
This commit is contained in:
Augie Fackler 2013-12-15 15:25:31 -05:00
parent a09eed97b0
commit ea43a55ef9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test-outgoing.t Executable file → Normal file
View File

@ -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'

4
tests/test-push.t
View File

@ -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'