diff -r 10c43444a38e -r 183c87d4e1a0 mercurial/hg.py
--- 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: