Skip to content
Snippets Groups Projects
Commit bf86e3e8 authored by Sean Farley's avatar Sean Farley
Browse files

unionrepo: fix wrong rev being checked in iscensored (issue5024)

parent 6c7d26ce
No related branches found
No related tags found
No related merge requests found
......@@ -182,7 +182,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):
......
......@@ -148,3 +148,22 @@
2:68c0685446a3 repo1-2
1:8a58db72e69d repo1-1
0:f093fec0529b repo1-0
union repos should use the correct rev number (issue5024)
$ hg init a
$ cd a
$ echo a0 >> f
$ hg ci -Aqm a0
$ cd ..
$ hg init b
$ cd b
$ echo b0 >> f
$ hg ci -Aqm b0
$ echo b1 >> f
$ hg ci -qm b1
$ cd ..
"hg files -v" to call fctx.size() -> fctx.iscensored()
$ hg files -R union:b+a -r2 -v
3 b/f (glob)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment