##// END OF EJS Templates
Update on pull -u when heads were closed (fixes issue666)....
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.

File last commit:

r4317:66249be9 default
r5080:73fdc8bd default
Show More
test-bad-pull
30 lines | 719 B | text/plain | TextLexer
#!/bin/sh
hg clone http://localhost:20059/ copy
echo $?
test -d copy || echo copy: No such file or directory
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 &
echo $! >> $DAEMON_PIDS
# give the server some time to start running
sleep 1
http_proxy= hg clone http://localhost:20059/foo copy2 2>&1 | \
sed -e 's/404.*/404/' -e 's/Date:.*/Date:/'
echo $?
kill $!