D3735: cmdutil: say that `graft --stop` stops the graft instead of aborting
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Fri Jun 15 08:48:23 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG47f5454a30ed: cmdutil: say that `graft --stop` stops the graft instead of aborting (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3735?vs=9062&id=9078
REVISION DETAIL
https://phab.mercurial-scm.org/D3735
AFFECTED FILES
mercurial/cmdutil.py
tests/test-graft.t
CHANGE DETAILS
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -244,7 +244,7 @@
$ hg ci -m 'commit interrupted graft'
abort: graft in progress
- (use 'hg graft --continue' or 'hg graft --stop' to abort)
+ (use 'hg graft --continue' or 'hg graft --stop' to stop)
[255]
Abort the graft and try committing:
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3173,7 +3173,7 @@
# (state file, clearable, allowcommit, error, hint)
unfinishedstates = [
('graftstate', True, False, _('graft in progress'),
- _("use 'hg graft --continue' or 'hg graft --stop' to abort")),
+ _("use 'hg graft --continue' or 'hg graft --stop' to stop")),
('updatestate', True, False, _('last update was interrupted'),
_("use 'hg update' to get a consistent checkout"))
]
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list