[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-----

+ hg init
+ echo a
+ hg add a
+ hg commit -t test -u test -d '0 0'
+ hg history
changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     test

+ hg tag -u test -d '0 0' bleah
+ hg history
changeset:   1:863197ef03781c4fc00276d83eb66c4cb9cd91df
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376

changeset:   0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag:         bleah
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     test

+ echo foo
+ hg tag -u test -d '0 0' bleah2
abort: working copy of .hgtags is changed!
(please commit .hgtags manually)
+ echo failed
failed