Mercurial > hg
view tests/test-bad-pull.t @ 14485:610873cf064a
Make pull -u behave like pull && update
Previously, pull would not update if new branch heads were received,
whereas pull && update would move to the tipmost branch head.
Also change the "crosses branches" abort in merge.update from
"crosses branches (merge branches or use --check to force update)"
to
"crosses branches (merge branches or update --check to force update)"
since it can no longer assume the user is running hg update.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 31 May 2011 11:52:22 -0700 |
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 $!