changeset 28900 | b65966f50058 |
parent 28470 | 80bd110dbf5e |
child 29205 | a0939666b836 |
--- a/hgext/convert/convcmd.py Thu Mar 24 16:01:07 2016 -0700 +++ b/hgext/convert/convcmd.py Wed Apr 13 00:16:21 2016 +0200 @@ -472,6 +472,9 @@ parents = [self.map.get(p, p) for p in parents] except KeyError: parents = [b[0] for b in pbranches] + parents.extend(self.map[x] + for x in commit.optparents + if x in self.map) if len(pbranches) != 2: cleanp2 = set() if len(parents) < 3: