equal
deleted
inserted
replaced
470 self.ui.status(_('spliced in %s as parents of %s\n') % |
470 self.ui.status(_('spliced in %s as parents of %s\n') % |
471 (_(' and ').join(parents), rev)) |
471 (_(' and ').join(parents), rev)) |
472 parents = [self.map.get(p, p) for p in parents] |
472 parents = [self.map.get(p, p) for p in parents] |
473 except KeyError: |
473 except KeyError: |
474 parents = [b[0] for b in pbranches] |
474 parents = [b[0] for b in pbranches] |
|
475 parents.extend(self.map[x] |
|
476 for x in commit.optparents |
|
477 if x in self.map) |
475 if len(pbranches) != 2: |
478 if len(pbranches) != 2: |
476 cleanp2 = set() |
479 cleanp2 = set() |
477 if len(parents) < 3: |
480 if len(parents) < 3: |
478 source = progresssource(self.ui, self.source, len(files)) |
481 source = progresssource(self.ui, self.source, len(files)) |
479 else: |
482 else: |