Mercurial > hg-stable
changeset 7951:4d9e8efb7326
rebase: correct help text
Show the correct parameters in help text
| author | Stefano Tortarolo <stefano.tortarolo@gmail.com> |
|---|---|
| date | Sun, 29 Mar 2009 14:47:59 +0200 |
| parents | 9bbcfa898cd3 |
| children | b214066b7e1d |
| files | hgext/rebase.py tests/test-rebase-parameters.out |
| diffstat | 2 files changed, 16 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Sat Mar 28 12:27:20 2009 -0400 +++ b/hgext/rebase.py Sun Mar 29 14:47:59 2009 +0200 @@ -427,15 +427,15 @@ "rebase": (rebase, [ - ('', 'keep', False, _('keep original revisions')), - ('', 'keepbranches', False, _('keep original branches')), ('s', 'source', '', _('rebase from a given revision')), ('b', 'base', '', _('rebase from the base of a given revision')), ('d', 'dest', '', _('rebase onto a given revision')), ('', 'collapse', False, _('collapse the rebased revisions')), + ('', 'keep', False, _('keep original revisions')), + ('', 'keepbranches', False, _('keep original branches')), ('c', 'continue', False, _('continue an interrupted rebase')), ('a', 'abort', False, _('abort an interrupted rebase')),] + templateopts, - _('hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | ' - '[--keep]')), + _('hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] ' + '[--keepbranches] | [-c] | [-a]')), }
--- a/tests/test-rebase-parameters.out Sat Mar 28 12:27:20 2009 -0400 +++ b/tests/test-rebase-parameters.out Sun Mar 29 14:47:59 2009 +0200 @@ -2,7 +2,7 @@ % Use continue and abort hg rebase: cannot use both abort and continue -hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep] +hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -15,12 +15,12 @@ options: - --keep keep original revisions - --keepbranches keep original branches -s --source rebase from a given revision -b --base rebase from the base of a given revision -d --dest rebase onto a given revision --collapse collapse the rebased revisions + --keep keep original revisions + --keepbranches keep original branches -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -30,7 +30,7 @@ % Use continue and collapse hg rebase: cannot use collapse with continue or abort -hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep] +hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -43,12 +43,12 @@ options: - --keep keep original revisions - --keepbranches keep original branches -s --source rebase from a given revision -b --base rebase from the base of a given revision -d --dest rebase onto a given revision --collapse collapse the rebased revisions + --keep keep original revisions + --keepbranches keep original branches -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -58,7 +58,7 @@ % Use continue/abort and dest/source hg rebase: abort and continue do not allow specifying revisions -hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep] +hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -71,12 +71,12 @@ options: - --keep keep original revisions - --keepbranches keep original branches -s --source rebase from a given revision -b --base rebase from the base of a given revision -d --dest rebase onto a given revision --collapse collapse the rebased revisions + --keep keep original revisions + --keepbranches keep original branches -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -86,7 +86,7 @@ % Use source and base hg rebase: cannot specify both a revision and a base -hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep] +hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a] move changeset (and descendants) to a different branch @@ -99,12 +99,12 @@ options: - --keep keep original revisions - --keepbranches keep original branches -s --source rebase from a given revision -b --base rebase from the base of a given revision -d --dest rebase onto a given revision --collapse collapse the rebased revisions + --keep keep original revisions + --keepbranches keep original branches -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file