Mercurial > hg-stable
changeset 27714:bbb61a8314c3
histedit: clarify modes
also fix terse command syntax
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 23 Dec 2015 06:36:47 +0000 |
| parents | fb2c77ba577a |
| children | f93e7540db8c |
| files | hgext/histedit.py |
| diffstat | 1 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/histedit.py Tue Dec 22 23:21:53 2015 +0000 +++ b/hgext/histedit.py Wed Dec 23 06:36:47 2015 +0000 @@ -867,7 +867,7 @@ ('f', 'force', False, _('force outgoing even for unrelated repositories')), ('r', 'rev', [], _('first revision to be edited'), _('REV'))], - _("[ANCESTOR] | --outgoing [URL]")) + _("[OPTIONS] ([ANCESTOR] | --outgoing [URL])")) def histedit(ui, repo, *freeargs, **opts): """interactively edit changeset history @@ -887,15 +887,18 @@ - `edit` to edit this changeset - The value from the "histedit.defaultrev" config option is used as a - revset to select the base revision when ANCESTOR is not specified. - The first revision returned by the revset is used. By default, this - selects the editable history that is unique to the ancestry of the - working directory. + There are a number of ways to select the root changset:: + + - Specify ANCESTOR directly - With --outgoing, this edits changesets not found in the - destination repository. If URL of the destination is omitted, the - 'default-push' (or 'default') path will be used. + - Use --outgoing -- it will be the first linear changeset not + included in destination. (See :hg:"help default-push") + + - Otherwise, the value from the "histedit.defaultrev" config option + is used as a revset to select the base revision when ANCESTOR is not + specified. The first revision returned by the revset is used. By + default, this selects the editable history that is unique to the + ancestry of the working directory. .. container:: verbose