mercurial/revlog.py
changeset 22934 8a096d4d0862
parent 22785 abc44fcc9c57
child 23254 d23834b871ac
--- a/mercurial/revlog.py	Tue Oct 14 16:16:04 2014 -0400
+++ b/mercurial/revlog.py	Wed Sep 03 16:34:29 2014 -0400
@@ -42,6 +42,7 @@
 
 RevlogError = error.RevlogError
 LookupError = error.LookupError
+CensoredNodeError = error.CensoredNodeError
 
 def getoffset(q):
     return int(q >> 16)
@@ -1176,7 +1177,10 @@
             ifh.flush()
             basetext = self.revision(self.node(cachedelta[0]))
             btext[0] = mdiff.patch(basetext, cachedelta[1])
-            self.checkhash(btext[0], p1, p2, node)
+            try:
+                self.checkhash(btext[0], p1, p2, node)
+            except CensoredNodeError:
+                pass # always import a censor tombstone.
             return btext[0]
 
         def builddelta(rev):