[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-----
+ mkdir t
+ cd t
+ hg init
+ hg id
unknown
+ echo a
+ hg add a
+ hg commit -t test -u test -d '0 0'
+ hg co
+ hg identify
acb14030fe0a tip
++ hg -q tip
++ cut -d : -f 2
+ T=acb14030fe0a21b60322c440ad2d20cf7685a376
+ echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first'
+ cat .hgtags
acb14030fe0a21b60322c440ad2d20cf7685a376 first
+ hg add .hgtags
+ hg commit -t 'add tags' -u test -d '0 0'
+ hg tags
tip 1:b9154636be938d3d431e75a7c906504a079bfe07
first 0:acb14030fe0a21b60322c440ad2d20cf7685a376
+ hg identify
b9154636be93 tip
+ echo bb
+ hg status
C a
+ hg identify
b9154636be93+ tip
+ hg co first
+ hg id
acb14030fe0a+ first
+ hg -v id
acb14030fe0a21b60322c440ad2d20cf7685a376+ first
+ hg status
C a
+ echo 1
+ hg add b
+ hg commit -t branch -u test -d '0 0'
+ hg id
c8edf04160c7 tip
+ hg co -m 1
+ hg id
c8edf04160c7+b9154636be93+ tip
+ hg status
C a
C .hgtags