Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 224:ccbcc4d76f81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bad assumption about uniqueness of file versions -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 fix bad assumption about uniqueness of file versions Mercurial had assumed that a given file hash could show up in only one changeset, and thus that the mapping from file revision to changeset was 1-to-1. But if two people perform the same edit with the same parents, we can get an identical hash in different changesets. So we've got to loosen up our uniqueness checks in addgroup and in verify. manifest hash: 5462003241e7d071ffa1741b87a59f646c9988ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMDkywK+sNU5EO8RAg9PAJ9YWSknfFBoeYve/+Z5DDGGvytDkwCgoMwj kT01PcjNzGPr1/Oe5WRvulE= =HC4t -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 12:43:16 -0800
parents 1aaa49039a6b
children 1651a3e61925
comparison
equal deleted inserted replaced
223:1aaa49039a6b 224:ccbcc4d76f81
812 tr = self.transaction() 812 tr = self.transaction()
813 813
814 # pull off the changeset group 814 # pull off the changeset group
815 self.ui.status("adding changesets\n") 815 self.ui.status("adding changesets\n")
816 co = self.changelog.tip() 816 co = self.changelog.tip()
817 cn = self.changelog.addgroup(getgroup(), csmap, tr) 817 cn = self.changelog.addgroup(getgroup(), csmap, tr, 1) # unique
818 changesets = self.changelog.rev(cn) - self.changelog.rev(co) 818 changesets = self.changelog.rev(cn) - self.changelog.rev(co)
819 819
820 # pull off the manifest group 820 # pull off the manifest group
821 self.ui.status("adding manifests\n") 821 self.ui.status("adding manifests\n")
822 mm = self.manifest.tip() 822 mm = self.manifest.tip()