mercurial/revlog.py
changeset 23857 8a3c132f93d2
parent 23856 062c3ad86651
child 24030 828dc8db5515
--- a/mercurial/revlog.py	Mon Jan 12 14:30:24 2015 -0500
+++ b/mercurial/revlog.py	Mon Jan 12 14:41:25 2015 -0500
@@ -1235,8 +1235,12 @@
             btext[0] = mdiff.patch(basetext, cachedelta[1])
             try:
                 self.checkhash(btext[0], p1, p2, node)
+                if flags & REVIDX_ISCENSORED:
+                    raise RevlogError(_('node %s is not censored') % node)
             except CensoredNodeError:
-                pass # always import a censor tombstone.
+                # must pass the censored index flag to add censored revisions
+                if not flags & REVIDX_ISCENSORED:
+                    raise
             return btext[0]
 
         def builddelta(rev):