##// END OF EJS Templates
transplant: forbid transplant to nonempty repositories with no working directory....
Brendan Cully -
r8176:2660e700 default
parent child Browse files
Show More
@@ -528,6 +528,8 b' def transplant(ui, repo, *revs, **opts):'
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 len(repo) > 0 and p1 == revlog.nullid:
532 raise util.Abort(_('no revision checked out'))
531 if not opts.get('continue'):
533 if not opts.get('continue'):
532 if p2 != revlog.nullid:
534 if p2 != revlog.nullid:
533 raise util.Abort(_('outstanding uncommitted merges'))
535 raise util.Abort(_('outstanding uncommitted merges'))
General Comments 0
You need to be logged in to leave comments. Login now