This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3678

graft: correct documentation about options can be reapplied
ClosedPublic

Authored by khanchi97 on Jun 2 2018, 1:21 PM.

Details

Reviewers
av6
Group Reviewers
hg-reviewers
Commits
rHGad50f0399e1e: graft: correct documentation about options can be reapplied
Summary

Now options --user and --date can be reapplied after we hit a conflict.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

khanchi97 created this revision.Jun 2 2018, 1:21 PM
av6 accepted this revision.Jun 4 2018, 7:47 AM
This revision is now accepted and ready to land.Jun 4 2018, 7:47 AM
yuja added a subscriber: yuja.Jun 4 2018, 8:29 AM

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?

Closed by commit rHGad50f0399e1e: graft: correct documentation about options can be reapplied (authored by khanchi97). · Explain WhyJun 4 2018, 8:34 AM
This revision was automatically updated to reflect the committed changes.
khanchi97 added a comment.Jun 4 2018, 8:51 AM
In 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.

yuja added a subscriber: pulkit.Jun 4 2018, 9:07 AM
> 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.

pulkit added a comment.Jun 4 2018, 10:40 AM
In 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 D3667 once --continue reapplies all the previous flags.

yuja added a comment.Jun 5 2018, 8:08 AM
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.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 8964

mercurial/commands.py

If a graft merge results in conflicts, the graft process is If a graft merge results in conflicts, the graft process is
interrupted so that the current merge can be manually resolved. interrupted so that the current merge can be manually resolved.
Once all conflicts are addressed, the graft process can be Once all conflicts are addressed, the graft process can be
continued with the -c/--continue option. continued with the -c/--continue option.
.. note:: .. note::
The -c/--continue option does not reapply earlier options, except The -c/--continue option does not reapply earlier options, except
for --force. for --force, --user and --date.
.. container:: verbose .. container:: verbose
Examples: Examples:
- copy a single change to the stable branch and edit its description:: - copy a single change to the stable branch and edit its description::
hg update stable hg update stable