Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/localrepo.py @ 2509:6350b01d173f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with wsgi changes.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 27 Jun 2006 00:10:41 -0700
parents ffde9eb23f59
children 0229ff95faec e1831f06eef1 55e592041076
line wrap: on
line diff
--- 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: