[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

d40cc5aacc31ed673d9b5b24f98bee78c283062c 0.4f

     2

1c590d34bf61e2ea12c71738e5a746cd74586157 0.4e

     3

7eca4cfa8aad5fce9a04f7d8acadcd0452e2f34e 0.4d

     4

b4d0c3786ad3e47beacf8412157326a32b6d25a4 0.4c

     5

f40273b0ad7b3a6d3012fd37736d0611f41ecf54 0.5

     6

0a28dfe59f8fab54a5118c5be4f40da34a53cdb7 0.5b