diff -r 9a80418646dd -r b2c9b36bd639 mercurial/hg.py --- a/mercurial/hg.py Fri Jul 01 14:18:02 2005 -0800 +++ b/mercurial/hg.py Fri Jul 01 14:34:31 2005 -0800 @@ -686,8 +686,7 @@ self.dirstate.forget(remove) def changes(self, node1, node2, files=None): - # changed, added, deleted, unknown - c, a, d, u, mf2 = [], [], [], [], None + mf2, u = None, [] def fcmp(fn, mf): t1 = self.wfile(fn).read() @@ -727,6 +726,9 @@ change = self.changelog.read(node2) mf2 = self.manifest.read(change[0]) + # flush lists from dirstate before comparing manifests + c, a = [], [] + change = self.changelog.read(node1) mf1 = self.manifest.read(change[0]).copy()