[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

set -x

     4

mkdir t

     5

cd t

     6

hg init

     7

hg id

     8

echo a > a

     9

hg add a

    10

hg commit -t "test" -u test -d "0 0"

    11

hg co

    12

hg identify

    13

T=`hg -q tip | cut -d : -f 2`

    14

echo "$T first" > .hgtags

    15

cat .hgtags

    16

hg add .hgtags

    17

hg commit -t "add tags" -u test -d "0 0"

    18

hg tags

    19

hg identify

    20

echo bb > a

    21

hg status

    22

hg identify

    23

hg co first

    24

hg id

    25

hg -v id

    26

hg status

    27

echo 1 > b

    28

hg add b

    29

hg commit -t "branch" -u test -d "0 0"

    30

hg id

    31

hg co -m 1

    32

hg id

    33

hg status

    34