Mercurial > hg

changeset 10943:15aaa3637f19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 19 Apr 2010 21:44:21 +0200
parents 2067532d95e7 (current diff) 6f26ce7ae175 (diff)
children 90f72f47cfc2
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Mon Apr 19 20:49:09 2010 +0200
+++ b/mercurial/context.py	Mon Apr 19 21:44:21 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