--- 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: