comparison hgext/rebase.py @ 9073:ec1cd3176625

rebase: wrapped docstrings at 78 characters
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Jul 2009 23:54:42 +0200
parents 1de6e7e1bb9f
children 07d127e771a1
comparison
equal deleted inserted replaced
9072:59e5437bbcdc 9073:ec1cd3176625
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2, incorporated herein by reference. 6 # GNU General Public License version 2, incorporated herein by reference.
7 7
8 '''command to move sets of revisions to a different ancestor 8 '''command to move sets of revisions to a different ancestor
9 9
10 This extension lets you rebase changesets in an existing Mercurial 10 This extension lets you rebase changesets in an existing Mercurial repository.
11 repository.
12 11
13 For more information: 12 For more information:
14 http://mercurial.selenic.com/wiki/RebaseProject 13 http://mercurial.selenic.com/wiki/RebaseProject
15 ''' 14 '''
16 15
40 return stats 39 return stats
41 40
42 def rebase(ui, repo, **opts): 41 def rebase(ui, repo, **opts):
43 """move changeset (and descendants) to a different branch 42 """move changeset (and descendants) to a different branch
44 43
45 Rebase uses repeated merging to graft changesets from one part of 44 Rebase uses repeated merging to graft changesets from one part of history
46 history onto another. This can be useful for linearizing local 45 onto another. This can be useful for linearizing local changes relative to
47 changes relative to a master development tree. 46 a master development tree.
48 47
49 If a rebase is interrupted to manually resolve a merge, it can be 48 If a rebase is interrupted to manually resolve a merge, it can be
50 continued with --continue/-c or aborted with --abort/-a. 49 continued with --continue/-c or aborted with --abort/-a.
51 """ 50 """
52 originalwd = target = None 51 originalwd = target = None