Show More
@@ -676,11 +676,7 b' def _dotransplant(ui, repo, *revs, **opt' | |||||
676 | raise error.Abort(_('no transplant to continue')) |
|
676 | raise error.Abort(_('no transplant to continue')) | |
677 | else: |
|
677 | else: | |
678 | cmdutil.checkunfinished(repo) |
|
678 | cmdutil.checkunfinished(repo) | |
679 | if p2 != revlog.nullid: |
|
679 | cmdutil.bailifchanged(repo) | |
680 | raise error.Abort(_('outstanding uncommitted merges')) |
|
|||
681 | m, a, r, d = repo.status()[:4] |
|
|||
682 | if m or a or r or d: |
|
|||
683 | raise error.Abort(_('outstanding local changes')) |
|
|||
684 |
|
680 | |||
685 | sourcerepo = opts.get('source') |
|
681 | sourcerepo = opts.get('source') | |
686 | if sourcerepo: |
|
682 | if sourcerepo: |
@@ -39,12 +39,12 b'' | |||||
39 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
39 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
40 | (branch merge, don't forget to commit) |
|
40 | (branch merge, don't forget to commit) | |
41 | $ hg transplant 1 |
|
41 | $ hg transplant 1 | |
42 |
abort: outstanding uncommitted merge |
|
42 | abort: outstanding uncommitted merge | |
43 | [255] |
|
43 | [255] | |
44 | $ hg up -qC tip |
|
44 | $ hg up -qC tip | |
45 | $ echo b0 > b1 |
|
45 | $ echo b0 > b1 | |
46 | $ hg transplant 1 |
|
46 | $ hg transplant 1 | |
47 |
abort: |
|
47 | abort: uncommitted changes | |
48 | [255] |
|
48 | [255] | |
49 | $ hg up -qC tip |
|
49 | $ hg up -qC tip | |
50 | $ echo b2 > b2 |
|
50 | $ echo b2 > b2 |
General Comments 0
You need to be logged in to leave comments.
Login now