tests/test-bad-pull
author mpm@selenic.com
Tue, 21 Jun 2005 19:19:39 -0800
changeset 416 5e9e8b8d2629
parent 395 fbe8834923c5
child 485 c5705ab9cebd
permissions -rwxr-xr-x
[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-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     1
#!/bin/bash
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     2
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     3
mkdir copy
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     4
cd copy
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     5
hg init http://localhost:20059/
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     6
hg verify
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     7
hg co
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     8
cat foo
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     9
hg manifest
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    10
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    11
cat > dumb.py <<EOF
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    12
import BaseHTTPServer, SimpleHTTPServer, signal
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    13
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    14
def run(server_class=BaseHTTPServer.HTTPServer,
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    15
        handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    16
    server_address = ('localhost', 20059)
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    17
    httpd = server_class(server_address, handler_class)
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    18
    httpd.serve_forever()
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    19
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    20
signal.signal(signal.SIGTERM, lambda x: sys.exit(0))
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    21
run()
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    22
EOF
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    23
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    24
python dumb.py 2>/dev/null &
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    25
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    26
mkdir copy2
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    27
cd copy2
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    28
hg init http://localhost:20059/foo
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    29
hg verify
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    30
hg co
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    31
cat foo
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    32
hg manifest
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    33
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    34
kill %1