Mercurial > public > mercurial-scm > hg-stable

diff mercurial/unionrepo.py @ 27750:443848eece18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 13 Jan 2016 15:47:37 -0600
parents 12f727a5b434 bf86e3e87123
children b966e35aad78
line wrap: on
line diff
--- a/mercurial/unionrepo.py	Tue Jan 12 13:10:31 2016 -0800
+++ b/mercurial/unionrepo.py	Wed Jan 13 15:47:37 2016 -0600
@@ -183,7 +183,8 @@
         """Check if a revision is censored."""
         if rev <= self.repotiprev:
             return filelog.filelog.iscensored(self, rev)
-        return self.revlog2.iscensored(rev)
+        node = self.node(rev)
+        return self.revlog2.iscensored(self.revlog2.rev(node))
 
 class unionpeer(localrepo.localpeer):
     def canpush(self):