view tests/test-bad-pull @ 408:3695fbd2c33b

[PATCH] Merging files that are deleted in both branches

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

[PATCH] Merging files that are deleted in both branches
From: Michael A Fetterman <[e-mail]>

OK, attached is an improved version of this patch...

When I went back through it, I discovered that the prior version was wrong
when doing real merges (as opposed to jumping between revisions that have
a simple linear relationship).  So that's been addressed here, too.

> Here's an hg changeset patch that deals with simultaneous deletion of a
file
> in both the working directory and in a merged branch.
>
> Test case included in the patch.

manifest hash: c8078733c252403314d8046efa6ecefc49c83050
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCuNF8ywK+sNU5EO8RArtdAJ9syw/JXRZzP1sxnEYXzZywkJLAPACeKpqL
5osA3AggrCbbSLTNcYVXJ8U=
=T5Ik
-----END PGP SIGNATURE-----

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