Mercurial > hg

changeset 2491:ffde9eb23f59

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
author Chris Mason <mason@suse.com>
date Fri, 23 Jun 2006 16:42:48 -0700
parents 6ff82ec1f4b8
children 2f4addf56715
files mercurial/localrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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: