Mercurial > hgsubversion

comparison utility_commands.py @ 31:05800c403321

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up the rebase docstring to be less vague.
author Augie Fackler <durin42@gmail.com>
date Wed, 15 Oct 2008 13:21:59 -0500
parents f2636cfed115
children 08be8ee73551
comparison
equal deleted inserted replaced
30:9867250e0a4a 31:05800c403321
33 return 0 33 return 0
34 34
35 35
36 @util.register_subcommand('rebase') 36 @util.register_subcommand('rebase')
37 def rebase_commits(ui, repo, hg_repo_path, **opts): 37 def rebase_commits(ui, repo, hg_repo_path, **opts):
38 """Rebases the current uncommitted revisions onto the top of the branch. 38 """Rebases the current unpushed revisions onto the top of the Subversion branch.
39
40 This moves a line of development from making its own head to the top of
41 Subversion development, linearizing the changes. In order to make sure you
42 rebase on top of the current top of Subversion work, you should probably run
43 'hg svn pull' before running this.
39 """ 44 """
40 hge = hg_delta_editor.HgChangeReceiver(hg_repo_path, 45 hge = hg_delta_editor.HgChangeReceiver(hg_repo_path,
41 ui_=ui) 46 ui_=ui)
42 svn_commit_hashes = dict(zip(hge.revmap.itervalues(), 47 svn_commit_hashes = dict(zip(hge.revmap.itervalues(),
43 hge.revmap.iterkeys())) 48 hge.revmap.iterkeys()))