--- a/mercurial/localrepo.py	Thu Nov 27 16:07:13 2008 +0100
+++ b/mercurial/localrepo.py	Thu Nov 27 16:07:17 2008 +0100
@@ -982,7 +982,7 @@
         else:
             ctx2 = self[node2]
 
-        working = ctx2 == self[None]
+        working = ctx2.rev() is None
         parentworking = working and ctx1 == self['.']
         match = match or match_.always(self.root, self.getcwd())
         listignored, listclean, listunknown = ignored, clean, unknown