Now options --user and --date can be reapplied after we hit a conflict.
Details
Details
- Reviewers
av6 - Group Reviewers
hg-reviewers - Commits
- rHGad50f0399e1e: graft: correct documentation about options can be reapplied
Diff Detail
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
Comment Actions
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?
Comment Actions
Yes, options that are saved in state file are --user and --date. And --no-commit is going to be added in this list.
Comment Actions
> 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.
Comment Actions
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.
Comment Actions
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.