Mercurial > hg

changeset 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 10c43444a38e
children 688d03d6997a
files mercurial/hg.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Tue Jun 21 19:43:40 2005 -0800
+++ b/mercurial/hg.py	Tue Jun 21 20:40:53 2005 -0800
@@ -1052,7 +1052,7 @@
                 s = 0
 
                 # is the wfile new since m1, and match m2?
-                if n not in m1:
+                if f not in m1:
                     t1 = self.wfile(f).read()
                     t2 = self.file(f).revision(m2[f])
                     if cmp(t1, t2) == 0: