Patchwork D3667: graft: fix the help text to say `graft reapplies previous options`

login
register
mail settings
Submitter phabricator
Date June 12, 2018, 12:27 p.m.
Message ID <f21e644d1be282ba2f28caf1a0608797@localhost.localdomain>
Download mbox | patch
Permalink /patch/32075/
State Not Applicable
Headers show

Comments

phabricator - June 12, 2018, 12:27 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGad4c5c0af6b5: graft: fix the help text to say `graft reapplies previous options` (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3667?vs=9014&id=9021

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

AFFECTED FILES
  mercurial/commands.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel
Josef 'Jeff' Sipek - June 12, 2018, 12:44 p.m.
On Tue, Jun 12, 2018 at 12:27:04 +0000, pulkit (Pulkit Goyal) wrote:
> This revision was automatically updated to reflect the committed changes.
> Closed by commit rHGad4c5c0af6b5: graft: fix the help text to say `graft reapplies previous options` (authored by pulkit, committed by ).
> 
> REPOSITORY
>   rHG Mercurial
> 
> CHANGES SINCE LAST UPDATE
>   https://phab.mercurial-scm.org/D3667?vs=9014&id=9021
> 
> REVISION DETAIL
>   https://phab.mercurial-scm.org/D3667
> 
> AFFECTED FILES
>   mercurial/commands.py
> 
> CHANGE DETAILS
> 
> diff --git a/mercurial/commands.py b/mercurial/commands.py
> --- a/mercurial/commands.py
> +++ b/mercurial/commands.py
> @@ -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 does reapply all the earlier options.

Minor nit:

s/does reapply/reapplies/

Jeff.

>  
>      .. container:: verbose
>  
> 
> 
> 
> To: pulkit, #hg-reviewers
> Cc: mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Yuya Nishihara - June 12, 2018, 1:59 p.m.
> > +    The -c/--continue option does reapply all the earlier options.
> 
> Minor nit:
> 
> s/does reapply/reapplies/

Fixed, thanks.

Patch

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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 does reapply all the earlier options.
 
     .. container:: verbose