Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-pull @ 1663:d529cdc0a3ee
return a non-zero exit code when a merge failed
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 30 Jan 2006 12:02:06 +1300 |
parents | 0902ffece4b4 |
children | 385b06493465 397b62d5dd13 |
line wrap: on
line source
#!/bin/sh mkdir test cd test echo foo>foo hg init hg addremove hg commit -m 1 hg verify hg serve -p 20059 > /dev/null & sleep 1 # wait for server to be started cd .. hg clone http://localhost:20059/ copy cd copy hg verify hg co cat foo hg manifest hg pull kill $!