author | Chris Mason <mason@suse.com> |
Fri, 23 Jun 2006 16:42:48 -0700 | |
changeset 2491 | ffde9eb23f59 |
parent 2490 | 6ff82ec1f4b8 |
child 2492 | 2f4addf56715 |
--- 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: