##// END OF EJS Templates
censor: accept censored revision during upgrade...
marmoute -
r51972:15a50bfa default
parent child Browse files
Show More
@@ -3537,7 +3537,11 b' class revlog:'
3537
3537
3538 sidedata = None
3538 sidedata = None
3539 if not cachedelta:
3539 if not cachedelta:
3540 try:
3540 rawtext = self._revisiondata(rev)
3541 rawtext = self._revisiondata(rev)
3542 except error.CensoredNodeError as censored:
3543 assert flags & REVIDX_ISCENSORED
3544 rawtext = censored.tombstone
3541 sidedata = self.sidedata(rev)
3545 sidedata = self.sidedata(rev)
3542 if sidedata is None:
3546 if sidedata is None:
3543 sidedata = self.sidedata(rev)
3547 sidedata = self.sidedata(rev)
@@ -561,10 +561,6 b' With the "abort" policy'
561 - changelog
561 - changelog
562 - manifest
562 - manifest
563
563
564 transaction abort!
565 rollback completed
566 abort: file censored target:613bc869fceb
567 [255]
568 $ hg verify --config censor.policy=ignore
564 $ hg verify --config censor.policy=ignore
569 checking changesets
565 checking changesets
570 checking manifests
566 checking manifests
@@ -598,10 +594,6 b' With the "ignore" policy'
598 - changelog
594 - changelog
599 - manifest
595 - manifest
600
596
601 transaction abort!
602 rollback completed
603 abort: file censored target:613bc869fceb
604 [255]
605 $ hg verify --config censor.policy=ignore
597 $ hg verify --config censor.policy=ignore
606 checking changesets
598 checking changesets
607 checking manifests
599 checking manifests
General Comments 0
You need to be logged in to leave comments. Login now