# HG changeset patch # User Matt Mackall # Date 1130303744 25200 # Node ID 54e4b187f69c96a3ddea4f1c84bd6b6d8ca904b9 # Parent 199bb2b4ed4af04e220ff501a734abc6bbe5679d Remove old manifest diff code, it's now buggy diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -39,16 +39,6 @@ class manifest(revlog): self.read(node) return self.mapcache[2] - def diff(self, a, b): - # this is sneaky, as we're not actually using a and b - if self.listcache and self.addlist and self.listcache[0] == a: - d = mdiff.diff(self.listcache[1], self.addlist, 1) - if mdiff.patch(a, d) != b: - raise AssertionError(_("sortdiff failed!")) - return d - else: - return mdiff.textdiff(a, b) - def add(self, map, flags, transaction, link, p1=None, p2=None, changed=None): # directly generate the mdiff delta from the data collected during