equal
deleted
inserted
replaced
526 opts['filter'] = ui.config('transplant', 'filter') |
526 opts['filter'] = ui.config('transplant', 'filter') |
527 |
527 |
528 tp = transplanter(ui, repo) |
528 tp = transplanter(ui, repo) |
529 |
529 |
530 p1, p2 = repo.dirstate.parents() |
530 p1, p2 = repo.dirstate.parents() |
531 if p1 == revlog.nullid: |
|
532 raise util.Abort(_('no revision checked out')) |
|
533 if not opts.get('continue'): |
531 if not opts.get('continue'): |
534 if p2 != revlog.nullid: |
532 if p2 != revlog.nullid: |
535 raise util.Abort(_('outstanding uncommitted merges')) |
533 raise util.Abort(_('outstanding uncommitted merges')) |
536 m, a, r, d = repo.status()[:4] |
534 m, a, r, d = repo.status()[:4] |
537 if m or a or r or d: |
535 if m or a or r or d: |