At bzr+ssh://bazaar.launchpad.net/~lifeless/bzr-rebase/dev ------------------------------------------------------------ revno: 117 revision-id: [email protected] parent: [email protected] committer: Robert Collins <[email protected]> branch nick: dev timestamp: Fri 2009-01-16 12:54:21 +1100 message: Support new-nick in rebase-continue === modified file '__init__.py' --- a/__init__.py 2009-01-15 06:07:29 +0000 +++ b/__init__.py 2009-01-16 01:54:21 +0000 @@ -256,10 +256,13 @@ class cmd_rebase_continue(Command): """Continue an interrupted rebase after resolving conflicts.""" - takes_options = ['merge-type'] + takes_options = ['merge-type', + Option('new-nick', + help='Change revisions to have the target branch nick.'), + ] @display_command - def run(self, merge_type=None): + def run(self, merge_type=None, new_nick=False): from rebase import (commit_rebase, rebase, rebase_plan_exists, read_rebase_plan, read_active_rebase_revid, remove_rebase_plan, workingtree_replay) @@ -280,11 +283,13 @@ oldrevid = read_active_rebase_revid(wt) if oldrevid is not None: oldrev = wt.branch.repository.get_revision(oldrevid) - commit_rebase(wt, oldrev, replace_map[oldrevid][0]) + commit_rebase(wt, oldrev, replace_map[oldrevid][0], + new_nick=new_nick) try: # Start executing plan from current Branch.last_revision() rebase(wt.branch.repository, replace_map, - workingtree_replay(wt, merge_type=merge_type)) + workingtree_replay(wt, merge_type=merge_type, + new_nick=new_nick)) except ConflictsInTree: raise BzrCommandError("A conflict occurred replaying a commit." " Resolve the conflict and run 'bzr rebase-continue' or "
-- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
