changeset 41371 | 608c15f76f50 |
parent 40366 | b14fdf1fb615 |
child 41399 | 5cb8158a61f7 |
--- a/hgext/transplant.py Thu Jan 24 12:47:54 2019 -0800 +++ b/hgext/transplant.py Thu Jan 24 16:16:10 2019 -0800 @@ -676,11 +676,7 @@ raise error.Abort(_('no transplant to continue')) else: cmdutil.checkunfinished(repo) - if p2 != revlog.nullid: - raise error.Abort(_('outstanding uncommitted merges')) - m, a, r, d = repo.status()[:4] - if m or a or r or d: - raise error.Abort(_('outstanding local changes')) + cmdutil.bailifchanged(repo) sourcerepo = opts.get('source') if sourcerepo: