##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Clean up some merge logic...
Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases
mpm@selenic.com - - Load All Authors

File last commit:

r814:0902ffec merge default
r993:6f274afc default
Show More
test-bad-pull
25 lines | 527 B | text/plain | TextLexer
/ tests / test-bad-pull
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
hg clone http://localhost:20059/ copy
echo $?
ls copy
cat > dumb.py <<EOF
import BaseHTTPServer, SimpleHTTPServer, signal
def run(server_class=BaseHTTPServer.HTTPServer,
handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
server_address = ('localhost', 20059)
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 &
hg clone http://localhost:20059/foo copy2
echo $?
kill $!