branch | stable |
changeset 20314 | b396032e1bb8 |
parent 20302 | 654dd8284ead |
child 20332 | a959f7167077 |
--- a/mercurial/localrepo.py Thu Jan 23 01:21:08 2014 +0100 +++ b/mercurial/localrepo.py Mon Jan 28 15:16:49 2013 +0100 @@ -1899,7 +1899,8 @@ # We can pick: # * missingheads part of common (::commonheads) common = set(outgoing.common) - cheads = [node for node in revs if node in common] + nm = self.changelog.nodemap + cheads = [node for node in revs if nm[node] in common] # and # * commonheads parents on missing revset = unfi.set('%ln and parents(roots(%ln))',