view tests/test-bad-pull @ 1798:d610fe0e6893

hgmerge: do not use file with markers in tools merging themselves This time I forgot about a crucial part of the logic change. The patch makes kdiff3 and tkdiff useful again.
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Thu, 23 Feb 2006 18:10:04 +0100
parents 0902ffece4b4
children 397b62d5dd13
line wrap: on
line source

#!/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 $!