equal
deleted
inserted
replaced
309 if os.path.exists(seriespath): |
309 if os.path.exists(seriespath): |
310 os.unlink(seriespath) |
310 os.unlink(seriespath) |
311 p1 = repo.dirstate.p1() |
311 p1 = repo.dirstate.p1() |
312 p2 = node |
312 p2 = node |
313 self.log(user, date, message, p1, p2, merge=merge) |
313 self.log(user, date, message, p1, p2, merge=merge) |
314 self.ui.write(str(inst) + '\n') |
314 self.ui.write(util.forcebytestr(inst) + '\n') |
315 raise TransplantError(_('fix up the working directory and run ' |
315 raise TransplantError(_('fix up the working directory and run ' |
316 'hg transplant --continue')) |
316 'hg transplant --continue')) |
317 else: |
317 else: |
318 files = None |
318 files = None |
319 if merge: |
319 if merge: |