##// END OF EJS Templates
run merge program in repo root....
run merge program in repo root. before, merge program was run in user current directory. Well defined location is better for scripts. no more need to pass HG_ROOT to merge program now.

File last commit:

r814:0902ffec merge default
r1885:c4d57726 default
Show More
test-bad-pull
25 lines | 527 B | text/plain | TextLexer
#!/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 $!