Submitter | adgar@google.com |
---|---|
Date | Nov. 6, 2014, 7:03 p.m. |
Message ID | <141a55f9e25968229e65.1415300588@adgar.nyc.corp.google.com> |
Download | mbox | patch |
Permalink | /patch/6609/ |
State | Changes Requested |
Headers | show |
Comments
Patch
diff -r f54bf90d831c -r 141a55f9e259 mercurial/revlog.py --- a/mercurial/revlog.py Sun Sep 14 18:57:59 2014 -0400 +++ b/mercurial/revlog.py Wed Sep 03 16:34:59 2014 -0400 @@ -1175,7 +1175,10 @@ if dfh: dfh.flush() ifh.flush() - basetext = self.revision(self.node(cachedelta[0])) + try: + basetext = self.revision(self.node(cachedelta[0])) + except CensoredNodeError, e: + basetext = e.metadata btext[0] = mdiff.patch(basetext, cachedelta[1]) try: self.checkhash(btext[0], p1, p2, node)