Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/localrepo.py
changeset 2491 ffde9eb23f59
parent 2478 287b7da4aeaa
child 2548 0229ff95faec
child 2549 e1831f06eef1
child 2564 55e592041076 
--- a/mercurial/localrepo.py	Tue Jun 20 15:02:23 2006 -0300
+++ b/mercurial/localrepo.py	Fri Jun 23 16:42:48 2006 -0700
@@ -619,7 +619,7 @@
 
         modified, added, removed, deleted, unknown, ignored = [],[],[],[],[],[]
         compareworking = False
-        if not node1 or node1 == self.dirstate.parents()[0]:
+        if not node1 or (not node2 and node1 == self.dirstate.parents()[0]):
             compareworking = True
 
         if not compareworking:
mercurial