Mercurial > evolve
changeset 1044:c878deb2fd73
evolve: attempt to clarify the documentation around --all and --any
This have been confusing to people. We try to be a bit more verbose in the
evolve help.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 12 Jun 2014 14:41:13 -0700 |
| parents | 6a7d34010f8f |
| children | b346d7a3d89e |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Fri Aug 08 18:15:01 2014 -0700 +++ b/hgext/evolve.py Thu Jun 12 14:41:13 2014 -0700 @@ -1151,8 +1151,8 @@ @command('^evolve|stabilize|solve', [('n', 'dry-run', False, 'do not perform actions, just print what would be done'), - ('A', 'any', False, 'evolve any troubled changeset'), - ('a', 'all', False, 'evolve all troubled changesets'), + ('A', 'any', False, 'also consider troubled changesets unrelated to current working directory'), + ('a', 'all', False, 'evolve all troubled changesets (implies any)'), ('c', 'continue', False, 'continue an interrupted evolution'), ] + mergetoolopts, _('[OPTIONS]...')) @@ -1165,9 +1165,10 @@ - update to a successor if the working directory parent is obsolete - By default, takes the first troubled changeset that looks relevant. - - (The logic is still a bit fuzzy) + By default a single changeset is evolved for each invocation and only + troubles changesets that would evolve as a descendant of the current + working directory will be considered. See --all and --any options to change + this behavior. - For unstable, this means taking the first which could be rebased as a child of the working directory parent revision or one of its descendants