comparison mercurial/commands.py @ 38291:a8e7ea176437

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
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 12 Jun 2018 02:36:34 +0530
parents fa4a286410a5
children 2ec44160165d
comparison
equal deleted inserted replaced
38290:0c7970d4e6b4 38291:a8e7ea176437
2159 If a graft merge results in conflicts, the graft process is 2159 If a graft merge results in conflicts, the graft process is
2160 interrupted so that the current merge can be manually resolved. 2160 interrupted so that the current merge can be manually resolved.
2161 Once all conflicts are addressed, the graft process can be 2161 Once all conflicts are addressed, the graft process can be
2162 continued with the -c/--continue option. 2162 continued with the -c/--continue option.
2163 2163
2164 .. note:: 2164 The -c/--continue option reapplies all the earlier options.
2165
2166 The -c/--continue option does not reapply earlier options, except
2167 for --force, --user and --date.
2168 2165
2169 .. container:: verbose 2166 .. container:: verbose
2170 2167
2171 Examples: 2168 Examples:
2172 2169