##// END OF EJS Templates
revlog: support importing censored file revision tombstones...
Mike Edgar -
r22934:8a096d4d default
parent child Browse files
Show More
@@ -42,6 +42,7 b' REVIDX_KNOWN_FLAGS = 0'
42 42
43 43 RevlogError = error.RevlogError
44 44 LookupError = error.LookupError
45 CensoredNodeError = error.CensoredNodeError
45 46
46 47 def getoffset(q):
47 48 return int(q >> 16)
@@ -1176,7 +1177,10 b' class revlog(object):'
1176 1177 ifh.flush()
1177 1178 basetext = self.revision(self.node(cachedelta[0]))
1178 1179 btext[0] = mdiff.patch(basetext, cachedelta[1])
1180 try:
1179 1181 self.checkhash(btext[0], p1, p2, node)
1182 except CensoredNodeError:
1183 pass # always import a censor tombstone.
1180 1184 return btext[0]
1181 1185
1182 1186 def builddelta(rev):
General Comments 0
You need to be logged in to leave comments. Login now