Submitter | adgar@google.com |
---|---|
Date | Oct. 15, 2014, 8:05 p.m. |
Message ID | <bda2ddd8d3d9f4f5cd24.1413403513@adgar.nyc.corp.google.com> |
Download | mbox | patch |
Permalink | /patch/6294/ |
State | Deferred |
Headers | show |
Comments
Patch
diff -r 4416e2cfe289 -r bda2ddd8d3d9 mercurial/revlog.py --- a/mercurial/revlog.py Wed Sep 03 16:34:59 2014 -0400 +++ b/mercurial/revlog.py Mon Sep 01 13:49:30 2014 +0200 @@ -1192,7 +1192,11 @@ delta = cachedelta[1] else: t = buildtext() - ptext = self.revision(self.node(rev)) + try: + ptext = self.revision(self.node(rev)) + except CensoredNodeError, e: + # building a new delta against a local tombstone is allowed + ptext = e.metadata delta = mdiff.textdiff(ptext, t) data = self.compress(delta) l = len(data[1]) + len(data[0])