diff -r f58235d85d6b -r 00140039bd8f mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue Aug 06 15:11:31 2013 -0500
+++ b/mercurial/localrepo.py	Tue Aug 06 15:11:42 2013 -0500
@@ -1457,14 +1457,8 @@
                     del mf[fn]
             return mf
 
-        if isinstance(node1, context.changectx):
-            ctx1 = node1
-        else:
-            ctx1 = self[node1]
-        if isinstance(node2, context.changectx):
-            ctx2 = node2
-        else:
-            ctx2 = self[node2]
+        ctx1 = self[node1]
+        ctx2 = self[node2]
 
         working = ctx2.rev() is None
         parentworking = working and ctx1 == self['.']