[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

+ mkdir t

     2

+ cd t

     3

+ hg init

     4

+ echo a

     5

+ hg add a

     6

+ hg commit -t test -u test -d '0 0'

     7

+ hg verify

     8

checking changesets

     9

checking manifests

    10

crosschecking files in changesets and manifests

    11

checking files

    12

1 files, 1 changesets, 1 total revisions

    13

+ hg parents

    14

changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376

    15

tag:         tip

    16

user:        test

    17

date:        Thu Jan  1 00:00:00 1970

    18

summary:     test

    19

    20

+ hg status

    21

+ hg undo

    22

attempting to rollback last transaction

    23

+ hg verify

    24

checking changesets

    25

checking manifests

    26

crosschecking files in changesets and manifests

    27

checking files

    28

0 files, 0 changesets, 0 total revisions

    29

+ hg parents

    30

+ hg status

    31

A a