# HG changeset patch
# User Chris Mason <mason@suse.com>
# Date 1151106168 25200
# Node ID ffde9eb23f592534e5ac11f1bbf779ea117c052d
# Parent  6ff82ec1f4b8b464e64a695e965dbec93057a894
Fix localrepo.changes()  Correctly decide if we are diffing the working dir

diff -r 6ff82ec1f4b8 -r ffde9eb23f59 mercurial/localrepo.py
--- 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: