equal
deleted
inserted
replaced
272 'hg transplant --continue')) |
272 'hg transplant --continue')) |
273 else: |
273 else: |
274 files = None |
274 files = None |
275 if merge: |
275 if merge: |
276 p1, p2 = repo.dirstate.parents() |
276 p1, p2 = repo.dirstate.parents() |
277 repo.dirstate.setparents(p1, node) |
277 repo.setparents(p1, node) |
278 m = match.always(repo.root, '') |
278 m = match.always(repo.root, '') |
279 else: |
279 else: |
280 m = match.exact(repo.root, '', files) |
280 m = match.exact(repo.root, '', files) |
281 |
281 |
282 n = repo.commit(message, user, date, extra=extra, match=m, |
282 n = repo.commit(message, user, date, extra=extra, match=m, |
338 if p1 != parent: |
338 if p1 != parent: |
339 raise util.Abort( |
339 raise util.Abort( |
340 _('working dir not at transplant parent %s') % |
340 _('working dir not at transplant parent %s') % |
341 revlog.hex(parent)) |
341 revlog.hex(parent)) |
342 if merge: |
342 if merge: |
343 repo.dirstate.setparents(p1, parents[1]) |
343 repo.setparents(p1, parents[1]) |
344 n = repo.commit(message, user, date, extra=extra, |
344 n = repo.commit(message, user, date, extra=extra, |
345 editor=self.editor) |
345 editor=self.editor) |
346 if not n: |
346 if not n: |
347 raise util.Abort(_('commit failed')) |
347 raise util.Abort(_('commit failed')) |
348 if not merge: |
348 if not merge: |