Mercurial > hg
changeset 7999:b25110140573
rebase: word-wrap help texts at 70 characters
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Sat, 04 Apr 2009 23:19:11 +0200 |
| parents | e2c55c4a25e2 |
| children | 83d7c9cfb065 |
| files | hgext/rebase.py tests/test-rebase-parameters.out |
| diffstat | 2 files changed, 27 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Sat Apr 04 23:18:51 2009 +0200 +++ b/hgext/rebase.py Sat Apr 04 23:19:11 2009 +0200 @@ -7,7 +7,8 @@ '''move sets of revisions to a different ancestor -This extension lets you rebase changesets in an existing Mercurial repository. +This extension lets you rebase changesets in an existing Mercurial +repository. For more information: http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject @@ -40,12 +41,12 @@ def rebase(ui, repo, **opts): """move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of history - onto another. This can be useful for linearizing local changes relative to - a master development tree. + Rebase uses repeated merging to graft changesets from one part of + history onto another. This can be useful for linearizing local + changes relative to a master development tree. - If a rebase is interrupted to manually resolve a merge, it can be continued - with --continue or aborted with --abort. + If a rebase is interrupted to manually resolve a merge, it can be + continued with --continue or aborted with --abort. """ originalwd = target = None external = nullrev
--- a/tests/test-rebase-parameters.out Sat Apr 04 23:18:51 2009 +0200 +++ b/tests/test-rebase-parameters.out Sat Apr 04 23:19:11 2009 +0200 @@ -6,12 +6,12 @@ move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of history - onto another. This can be useful for linearizing local changes relative to - a master development tree. + Rebase uses repeated merging to graft changesets from one part of + history onto another. This can be useful for linearizing local + changes relative to a master development tree. - If a rebase is interrupted to manually resolve a merge, it can be continued - with --continue or aborted with --abort. + If a rebase is interrupted to manually resolve a merge, it can be + continued with --continue or aborted with --abort. options: @@ -34,12 +34,12 @@ move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of history - onto another. This can be useful for linearizing local changes relative to - a master development tree. + Rebase uses repeated merging to graft changesets from one part of + history onto another. This can be useful for linearizing local + changes relative to a master development tree. - If a rebase is interrupted to manually resolve a merge, it can be continued - with --continue or aborted with --abort. + If a rebase is interrupted to manually resolve a merge, it can be + continued with --continue or aborted with --abort. options: @@ -62,12 +62,12 @@ move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of history - onto another. This can be useful for linearizing local changes relative to - a master development tree. + Rebase uses repeated merging to graft changesets from one part of + history onto another. This can be useful for linearizing local + changes relative to a master development tree. - If a rebase is interrupted to manually resolve a merge, it can be continued - with --continue or aborted with --abort. + If a rebase is interrupted to manually resolve a merge, it can be + continued with --continue or aborted with --abort. options: @@ -90,12 +90,12 @@ move changeset (and descendants) to a different branch - Rebase uses repeated merging to graft changesets from one part of history - onto another. This can be useful for linearizing local changes relative to - a master development tree. + Rebase uses repeated merging to graft changesets from one part of + history onto another. This can be useful for linearizing local + changes relative to a master development tree. - If a rebase is interrupted to manually resolve a merge, it can be continued - with --continue or aborted with --abort. + If a rebase is interrupted to manually resolve a merge, it can be + continued with --continue or aborted with --abort. options: