Mercurial > hg
changeset 27678:b97004648028
transplant: specify the right file and path for unfinishedstates
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 06 Jan 2016 04:59:46 +0000 |
| parents | 128ef8828ed5 |
| children | 6822f9382b4c |
| files | hgext/transplant.py tests/test-transplant.t |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/transplant.py Wed Jan 06 04:59:21 2016 +0000 +++ b/hgext/transplant.py Wed Jan 06 04:59:46 2016 +0000 @@ -722,7 +722,7 @@ revsetpredicate.setup() templatekw.keywords['transplanted'] = kwtransplanted cmdutil.unfinishedstates.append( - ['series', True, False, _('transplant in progress'), + ['transplant/journal', True, False, _('transplant in progress'), _("use 'hg transplant --continue' or 'hg update' to abort")]) # tell hggettext to extract docstrings from these functions:
--- a/tests/test-transplant.t Wed Jan 06 04:59:21 2016 +0000 +++ b/tests/test-transplant.t Wed Jan 06 04:59:46 2016 +0000 @@ -464,6 +464,10 @@ patch failed to apply abort: fix up the working directory and run hg transplant --continue [255] + $ hg transplant 1:3 + abort: transplant in progress + (use 'hg transplant --continue' or 'hg update' to abort) + [255] $ echo fixed > baz $ hg transplant --continue 9d6d6b5a8275 transplanted as d80c49962290