Patchwork D3667: graft: drop help note saying "--continue does not reapply earlier options"

login
register
mail settings
Submitter phabricator
Date May 28, 2018, 3:27 p.m.
Message ID <differential-rev-PHID-DREV-qkv67ssw2mmpjqvd5ex5-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/31891/
State Superseded
Headers show

Comments

phabricator - May 28, 2018, 3:27 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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
  - edit
  - 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`.
  
  ..  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`.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3667

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2162,11 +2162,6 @@ 
     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.
-
     .. container:: verbose
 
       Examples: