equal
deleted
inserted
replaced
295 self.ui.status(_('spliced in %s as parents of %s\n') % |
295 self.ui.status(_('spliced in %s as parents of %s\n') % |
296 (parents, rev)) |
296 (parents, rev)) |
297 parents = [self.map.get(p, p) for p in parents] |
297 parents = [self.map.get(p, p) for p in parents] |
298 except KeyError: |
298 except KeyError: |
299 parents = [b[0] for b in pbranches] |
299 parents = [b[0] for b in pbranches] |
300 newnode = self.dest.putcommit(files, copies, parents, commit, self.source) |
300 newnode = self.dest.putcommit(files, copies, parents, commit, |
|
301 self.source, self.map) |
301 self.source.converted(rev, newnode) |
302 self.source.converted(rev, newnode) |
302 self.map[rev] = newnode |
303 self.map[rev] = newnode |
303 |
304 |
304 def convert(self, sortmode): |
305 def convert(self, sortmode): |
305 try: |
306 try: |