Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix localrepo.changes() Correctly decide if we are diffing the working dir
authorChris Mason <mason@suse.com>
Fri, 23 Jun 2006 16:42:48 -0700
changeset 2491 ffde9eb23f59
parent 2490 6ff82ec1f4b8
child 2492 2f4addf56715
Fix localrepo.changes() Correctly decide if we are diffing the working dir
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -619,7 +619,7 @@ class localrepository(object):
 
         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-crew-with-dirclash