[PATCH] Merging identical changes from another branch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Merging identical changes from another branch From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> The issue comes up when a local uncommitted *new* file (i.e. not in the current manifest) is being merged with an identical file from a branch. Since the file is not in the current manifest (it's either in the current "to-be-added" list, or in the "unknown" state), there's no (local) node from which to create a mergepoint. manifest hash: 4e64ce654a6473524789a97bbaf8bff61b4343af -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuM/1ywK+sNU5EO8RAn7xAKCJoH/CgzVK4h4xPJDrd2lY9XOINACgmt01 92uuMswZXcoCchQAaxew7C0= =qRsk -----END PGP SIGNATURE-----

     1

#!/bin/bash

     2

     3

mkdir copy

     4

cd copy

     5

hg init http://localhost:20059/

     6

hg verify

     7

hg co

     8

cat foo

     9

hg manifest

    10

    11

cat > dumb.py <<EOF

    12

import BaseHTTPServer, SimpleHTTPServer, signal

    13

    14

def run(server_class=BaseHTTPServer.HTTPServer,

    15

        handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):

    16

    server_address = ('localhost', 20059)

    17

    httpd = server_class(server_address, handler_class)

    18

    httpd.serve_forever()

    19

    20

signal.signal(signal.SIGTERM, lambda x: sys.exit(0))

    21

run()

    22

EOF

    23

    24

python dumb.py 2>/dev/null &

    25

    26

mkdir copy2

    27

cd copy2

    28

hg init http://localhost:20059/foo

    29

hg verify

    30

hg co

    31

cat foo

    32

hg manifest

    33

    34

kill %1