D4169: status: advertise --abort instead of 'update -C .' to abort graft
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Aug 9 14:06:59 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG5b04b6204931: status: advertise --abort instead of 'update -C .' to abort graft (authored by pulkit, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D4169?vs=10098&id=10131
REVISION DETAIL
https://phab.mercurial-scm.org/D4169
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
@@ -237,7 +237,7 @@
# To mark files as resolved: hg resolve --mark FILE
# To continue: hg graft --continue
- # To abort: hg update --clean . (warning: this will discard uncommitted changes)
+ # To abort: hg graft --abort
Commit while interrupted should fail:
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -613,7 +613,7 @@
def _graftmsg():
# tweakdefaults requires `update` to have a rev hence the `.`
- return _helpmessage('hg graft --continue', _updatecleanmsg())
+ return _helpmessage('hg graft --continue', 'hg graft --abort')
def _mergemsg():
# tweakdefaults requires `update` to have a rev hence the `.`
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list