# HG changeset patch # User timeless # Date 2016-01-06 04:59:46 # Node ID b970046480289562bc677d1c4372aa9753778eb5 # Parent 128ef8828ed58b61bb3d3502f5f52b65828008a9 transplant: specify the right file and path for unfinishedstates diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -722,7 +722,7 @@ def extsetup(ui): 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: diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -464,6 +464,10 @@ test multiple revisions and --continue 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