Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transplant: specify the right file and path for unfinishedstates
authortimeless <timeless@mozdev.org>
Wed, 06 Jan 2016 04:59:46 +0000
changeset 27678 b97004648028
parent 27677 128ef8828ed5
child 27679 6822f9382b4c
transplant: specify the right file and path for unfinishedstates
hgext/transplant.py file | annotate | diff | comparison | revisions
tests/test-transplant.t file | annotate | diff | comparison | revisions 
--- 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
mercurial