Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 428:183c87d4e1a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix typo in merging new files -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix typo in merging new files manifest hash: 4a6fee1e54c5c465a74f4d756a1ac549b15fdb2f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuOvVywK+sNU5EO8RArovAJ4ua9EhnO8wWfKRZ36E6F4Wrv5JPACghCXn sHr/TSkxdy48OUVkhTbhhhQ= =poww -----END PGP SIGNATURE-----
author mpm@selenic.com
date Tue, 21 Jun 2005 20:40:53 -0800
parents 43b8da7420a9
children 688d03d6997a
comparison
equal deleted inserted replaced
422:10c43444a38e 428:183c87d4e1a0
1050 for f, n in mw.iteritems(): 1050 for f, n in mw.iteritems():
1051 if f in m2: 1051 if f in m2:
1052 s = 0 1052 s = 0
1053 1053
1054 # is the wfile new since m1, and match m2? 1054 # is the wfile new since m1, and match m2?
1055 if n not in m1: 1055 if f not in m1:
1056 t1 = self.wfile(f).read() 1056 t1 = self.wfile(f).read()
1057 t2 = self.file(f).revision(m2[f]) 1057 t2 = self.file(f).revision(m2[f])
1058 if cmp(t1, t2) == 0: 1058 if cmp(t1, t2) == 0:
1059 mark[f] = 1 1059 mark[f] = 1
1060 n = m2[f] 1060 n = m2[f]