D3678: graft: correct documentation about options can be reapplied
yuja added a comment. > About this change in help, I am going to drop this note completely in https://phab.mercurial-scm.org/D3667 once --continue reapplies all the previous flags. Cool, thanks. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3678 To: khanchi97, #hg-reviewers, av6 Cc: pulkit, yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: D3678: graft: correct documentation about options can be reapplied
> About this change in help, I am going to drop this note completely in > https://phab.mercurial-scm.org/D3667 once --continue reapplies all the > previous flags. Cool, thanks. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3678: graft: correct documentation about options can be reapplied
pulkit added a comment. In https://phab.mercurial-scm.org/D3678#57916, @yuja wrote: > > > Does it mean --currentuser and --currentdate aren't saved in the state file? > > > > Yes, options that are saved in state file are --user and --date. And --no-commit is going to be added in this list. > > Thanks. > > @pulkit, I think --currentuser/--currentdate can be the user/date of the > interrupted graft session begun. No need to save them separately. Yes, we don't store them separately: https://www.mercurial-scm.org/repo/hg-committed/file/tip/mercurial/commands.py#l2337 About this change in help, I am going to drop this note completely in https://phab.mercurial-scm.org/D3667 once --continue reapplies all the previous flags. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3678 To: khanchi97, #hg-reviewers, av6 Cc: pulkit, yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3678: graft: correct documentation about options can be reapplied
yuja added a subscriber: pulkit. yuja added a comment. > > Does it mean --currentuser and --currentdate aren't saved in the state file? > > Yes, options that are saved in state file are --user and --date. And --no-commit is going to be added in this list. Thanks. @pulkit, I think --currentuser/--currentdate can be the user/date of the interrupted graft session begun. No need to save them separately. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3678 To: khanchi97, #hg-reviewers, av6 Cc: pulkit, yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: D3678: graft: correct documentation about options can be reapplied
> > Does it mean --currentuser and --currentdate aren't saved in the state > file? > > Yes, options that are saved in state file are --user and --date. And > --no-commit is going to be added in this list. Thanks. @pulkit, I think --currentuser/--currentdate can be the user/date of the interrupted graft session begun. No need to save them separately. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3678: graft: correct documentation about options can be reapplied
khanchi97 added a comment. In https://phab.mercurial-scm.org/D3678#57907, @yuja wrote: > Queued per review, thanks. > > > The -c/--continue option does not reapply earlier options, except > > > > - for --force. + for --force, --user and --date. > > Does it mean --currentuser and --currentdate aren't saved in the state file? Yes, options that are saved in state file are --user and --date. And --no-commit is going to be added in this list. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3678 To: khanchi97, #hg-reviewers, av6 Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3678: graft: correct documentation about options can be reapplied
This revision was automatically updated to reflect the committed changes. Closed by commit rHGad50f0399e1e: graft: correct documentation about options can be reapplied (authored by khanchi97, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3678?vs=8952=8964 REVISION DETAIL https://phab.mercurial-scm.org/D3678 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 @@ -2164,7 +2164,7 @@ .. note:: The -c/--continue option does not reapply earlier options, except - for --force. + for --force, --user and --date. .. container:: verbose To: khanchi97, #hg-reviewers, av6 Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3678: graft: correct documentation about options can be reapplied
yuja added a comment. Queued per review, thanks. > The -c/--continue option does not reapply earlier options, except > > - for --force. + for --force, --user and --date. Does it mean --currentuser and --currentdate aren't saved in the state file? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3678 To: khanchi97, #hg-reviewers, av6 Cc: yuja, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: D3678: graft: correct documentation about options can be reapplied
Queued per review, thanks. > The -c/--continue option does not reapply earlier options, except > - for --force. > + for --force, --user and --date. Does it mean --currentuser and --currentdate aren't saved in the state file? ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D3678: graft: correct documentation about options can be reapplied
khanchi97 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Now options --user and --date can be reapplied after we hit a conflict. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D3678 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 @@ -2164,7 +2164,7 @@ .. note:: The -c/--continue option does not reapply earlier options, except - for --force. + for --force, --user and --date. .. container:: verbose To: khanchi97, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
