graft: fix the help text to say `graft reapplies previous options`
The options which graft accepts are:
* rev
* continue
* edit
* log
* force
* currentdate
* currentuser
* date
* user
* tool
* dryrun
Out of these following should be reapplied in case conflicts occur and user does
`hg graft --continue`:
* rev
* log
* force
* currentuser
* currentdate
* date
* user
rev and force were already reapplied by --continue. Some recent refactors made
graft to store the values of other options in graftstate and reapplies them at
`hg graft --continue`.
Now all the options which should be reapplied are taken care of, we can easily
remove the help note which says that `--continue does not reapply earlier
options` and help text saying that we reapplies earlier options.
.. feature:: `hg graft --continue` now reapplies all the earlier options
`hg graft` now preserves the value of all the flags and reapplies them in
case of `hg graft --continue`.
Differential Revision: https://phab.mercurial-scm.org/D3667
--- a/mercurial/commands.py Mon Jun 11 10:09:35 2018 -0700
+++ b/mercurial/commands.py Tue Jun 12 02:36:34 2018 +0530
@@ -2161,10 +2161,7 @@
Once all conflicts are addressed, the graft process can be
continued with the -c/--continue option.
- .. note::
-
- The -c/--continue option does not reapply earlier options, except
- for --force, --user and --date.
+ The -c/--continue option reapplies all the earlier options.
.. container:: verbose