diff -r 898d68468df2 -r 6f26ce7ae175 mercurial/context.py
--- a/mercurial/context.py	Sun Apr 18 15:47:49 2010 +0200
+++ b/mercurial/context.py	Mon Apr 19 20:30:31 2010 +0200
@@ -276,14 +276,14 @@
 
     def __hash__(self):
         try:
-            return hash((self._path, self._fileid))
+            return hash((self._path, self._filenode))
         except AttributeError:
             return id(self)
 
     def __eq__(self, other):
         try:
             return (self._path == other._path
-                    and self._fileid == other._fileid)
+                    and self._filenode == other._filenode)
         except AttributeError:
             return False