Mercurial > hg
view tests/test-bad-pull.t @ 14721:4fcde634f5e0 stable
revert: be more helpful on uncommitted merges
BEFORE:
$ hg revert
abort: no files or directories specified
(use --all to discard all changes)
AFTER:
$ hg revert
abort: no files or directories specified
(uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Wed, 22 Jun 2011 15:34:33 +0200 |
parents | 97ffc68f71d3 |
children | c5c9ca3719f9 |
line wrap: on
line source
$ hg clone http://localhost:$HGPORT/ copy abort: error: Connection refused [255] $ test -d copy || echo copy: No such file or directory copy: No such file or directory $ cat > dumb.py <<EOF > import BaseHTTPServer, SimpleHTTPServer, os, signal > def run(server_class=BaseHTTPServer.HTTPServer, > handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler): > server_address = ('localhost', int(os.environ['HGPORT'])) > httpd = server_class(server_address, handler_class) > httpd.serve_forever() > signal.signal(signal.SIGTERM, lambda x: sys.exit(0)) > run() > EOF $ python dumb.py 2>/dev/null & $ echo $! >> $DAEMON_PIDS give the server some time to start running $ sleep 1 $ hg clone http://localhost:$HGPORT/foo copy2 2>&1 abort: HTTP Error 404: * (glob) [255] $ kill $!