changeset 2491 | ffde9eb23f59 |
parent 2478 | 287b7da4aeaa |
child 2548 | 0229ff95faec |
child 2549 | e1831f06eef1 |
child 2564 | 55e592041076 |
--- 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: