##// END OF EJS Templates
[PATCH] Removal of a file added by merging branches...
[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----

File last commit:

r395:fbe88349 default
r416:5e9e8b8d default
Show More
test-bad-pull
34 lines | 604 B | text/plain | TextLexer
#!/bin/bash
mkdir copy
cd copy
hg init http://localhost:20059/
hg verify
hg co
cat foo
hg manifest
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 &
mkdir copy2
cd copy2
hg init http://localhost:20059/foo
hg verify
hg co
cat foo
hg manifest
kill %1