Mercurial > evolve
changeset 4091:2c60ad0d54a9 stable
rewind: fix help text (mostly grammar, but also s/precursor/predecessor)
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 07 Sep 2018 11:08:47 -0700 |
| parents | 6179a40d27c7 |
| children | 1630756a6a46 |
| files | hgext3rd/evolve/rewind.py |
| diffstat | 1 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/rewind.py Thu Sep 06 16:14:24 2018 -0700 +++ b/hgext3rd/evolve/rewind.py Fri Sep 07 11:08:47 2018 -0700 @@ -27,49 +27,49 @@ @eh.command( '^rewind', - [('', 'to', [], _("rewind to these revision")), + [('', 'to', [], _("rewind to these revisions")), ('', 'as-divergence', None, _("preserve current latest successors")), ('', 'exact', None, _("only rewind explicitly selected revisions")), ('', 'from', [], _("rewind these revisions to their predecessors")), ], _('')) def rewind(ui, repo, **opts): - """rewind stacks of changeset to a previous content + """rewind a stack of changesets to a previous state This command can be used to restore stacks of changesets to an obsolete - state, creating identical identical copies. + state, creating identical copies. - There are two mains way to select the rewind target. Rewinding "from" - changesets will restore the direct precursors of theses changesets (and + There are two main ways to select the rewind target. Rewinding "from" + changesets will restore the direct predecessors of these changesets (and obsolete the changeset you rewind from). Rewinding "to" will restore the changeset you have selected (and obsolete their latest successors). By default, we rewind from the working copy parents, restoring its - precursor. + predecessor. When we rewind to an obsolete version, we also rewind to all its obsolete - ancestors. To only rewind to the explicitly selection changesets use the + ancestors. To only rewind to the explicitly selected changesets use the `--exact` flag. Using the `--exact` flag can restore some changesets as orphan. - The latest successors the obsolete changesets will be superseed by these - new copies. This behavior can be disabled using `--as-divergence`, the - current latest successors won't be affected and content-divergence will - appears between them and the restored version of the obsolete changesets. + The latest successors of the obsolete changesets will be superseded by + these new copies. This behavior can be disabled using `--as-divergence`, + the current latest successors won't be affected and content-divergence will + appear between them and the restored version of the obsolete changesets. - Current rought edges: + Current rough edges: * fold: rewinding to only some of the initially folded changesets will be problematic. The fold result is marked obsolete and the part not - rewinded too are "lost". Please use --as-divergence when you + rewinded to are "lost". Please use --as-divergence when you need to perform such operation. - * :hg:`rewind` might affect changeset outside the current stack. Without --exact, we - also restore ancestors of the rewind target, obsoleting their - latest successors (unless --as-divergent is provided). In some - case, these latest successors will be on branches unrelated to - the changeset you rewind from. - (We plan to automatically detect this cases in the future) + * :hg:`rewind` might affect changesets outside the current stack. Without + --exact, we also restore ancestors of the rewind target, + obsoleting their latest successors (unless --as-divergent is + provided). In some case, these latest successors will be on + branches unrelated to the changeset you rewind from. + (We plan to automatically detect this case in the future) """ unfi = repo.unfiltered()