Mercurial > hg
changeset 9589:fdf0c375cdbf
rebase: change rebase help to talk about changesets and branch names
| author | timeless@mozdev.org |
|---|---|
| date | Wed, 14 Oct 2009 20:55:39 +0300 |
| parents | a9d1e7c8160e |
| children | 07a62819b309 |
| files | hgext/rebase.py tests/test-rebase-parameters.out |
| diffstat | 2 files changed, 15 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Wed Oct 14 21:21:09 2009 -0700 +++ b/hgext/rebase.py Wed Oct 14 20:55:39 2009 +0300 @@ -460,9 +460,9 @@ ('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')), + ('', 'collapse', False, _('collapse the rebased changesets')), + ('', 'keep', False, _('keep original changesets')), + ('', 'keepbranches', False, _('keep original branch names')), ('c', 'continue', False, _('continue an interrupted rebase')), ('a', 'abort', False, _('abort an interrupted rebase')),] + templateopts,
--- a/tests/test-rebase-parameters.out Wed Oct 14 21:21:09 2009 -0700 +++ b/tests/test-rebase-parameters.out Wed Oct 14 20:55:39 2009 +0300 @@ -18,9 +18,9 @@ -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 + --collapse collapse the rebased changesets + --keep keep original changesets + --keepbranches keep original branch names -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -46,9 +46,9 @@ -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 + --collapse collapse the rebased changesets + --keep keep original changesets + --keepbranches keep original branch names -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -74,9 +74,9 @@ -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 + --collapse collapse the rebased changesets + --keep keep original changesets + --keepbranches keep original branch names -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file @@ -102,9 +102,9 @@ -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 + --collapse collapse the rebased changesets + --keep keep original changesets + --keepbranches keep original branch names -c --continue continue an interrupted rebase -a --abort abort an interrupted rebase --style display using template map file