Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/context.py @ 4815:8808ea7da86b
merge: make test for fast-forward merge stricter (issue619) don't allow merging with an ancestor fix != on contexts add a test
author: Matt Mackall <mpm@selenic.com>
date: Thu, 05 Jul 2007 13:34:18 -0500
parents: 6b2e8cb39583
children: e45c5120ca27
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -40,6 +40,9 @@ class changectx(object):
         except AttributeError:
             return False
 
+    def __ne__(self, other):
+        return not (self == other)
+
     def __nonzero__(self):
         return self._rev != nullrev
 
@@ -185,6 +188,9 @@ class filectx(object):
         except AttributeError:
             return False
 
+    def __ne__(self, other):
+        return not (self == other)
+
     def filectx(self, fileid):
         '''opens an arbitrary revision of the file without
         opening a new filelog'''