diff -r 09459edfb48b -r 40040e4015f9 mercurial/context.py
--- a/mercurial/context.py	Wed Aug 14 15:25:14 2013 -0500
+++ b/mercurial/context.py	Wed Aug 14 15:28:43 2013 -0500
@@ -859,6 +859,9 @@
     def __str__(self):
         return str(self._parents[0]) + "+"
 
+    def __nonzero__(self):
+        return True
+
 class workingctx(commitablectx):
     """A workingctx object makes access to data related to
     the current working directory convenient.
@@ -872,9 +875,6 @@
                  changes=None):
         super(workingctx, self).__init__(repo, text, user, date, extra, changes)
 
-    def __nonzero__(self):
-        return True
-
     def __contains__(self, key):
         return self._repo.dirstate[key] not in "?r"