[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

checking changesets

     2

checking manifests

     3

crosschecking files in changesets and manifests

     4

checking files

     5

1 files, 1 changesets, 1 total revisions

     6

requesting all changes

     7

adding changesets

     8

adding manifests

     9

adding file revisions

    10

modified 1 files, added 1 changesets and 1 new revisions

    11

checking changesets

    12

checking manifests

    13

crosschecking files in changesets and manifests

    14

checking files

    15

1 files, 1 changesets, 1 total revisions

    16

foo

    17

2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo

    18

killed!