Mercurial > public > mercurial-scm > hg-stable

diff mercurial/manifest.py @ 11934:cf858e76e992

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifest: correct readdelta() according to parentdeltas
author Pradeepkumar Gayam <in3xes@gmail.com>
date Tue, 10 Aug 2010 22:28:52 +0530
parents 69e0bcf36961
children 5f7ee3db3dd8
line wrap: on
line diff
--- a/mercurial/manifest.py	Tue Aug 10 22:28:30 2010 +0530
+++ b/mercurial/manifest.py	Tue Aug 10 22:28:52 2010 +0530
@@ -36,6 +36,8 @@
 
     def readdelta(self, node):
         r = self.rev(node)
+        if self._parentdelta:
+            return self.parse(mdiff.patchtext(self.revdiff(self.deltaparent(r), r)))
         return self.parse(mdiff.patchtext(self.revdiff(r - 1, r)))
 
     def read(self, node):