author | Matt Mackall <mpm@selenic.com> |
Fri, 29 Sep 2006 15:56:36 -0500 | |
changeset 3197 | ff15ba23c1cf |
parent 3196 | 1605e336d229 |
child 3198 | e78185746554 |
--- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -330,7 +330,9 @@ class localrepository(repo.repository): else: n = self.changelog.lookup(changeid) pl = self.changelog.parents(n) - return [self.changectx(n) for n in pl if n != nullid] + if pl[1] == nullid: + return [self.changectx(pl[0])] + return [self.changectx(pl[0]), self.changectx(pl[1])] def filectx(self, path, changeid=None, fileid=None): """changeid can be a changeset revision, node, or tag.