/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-04-01 03:52:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2389.
  • Revision ID: aaron.bentley@utoronto.ca-20070401035231-w87zy7hrpre4v81m
rename get_target_revision to install_revisions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
602
602
            if revision is not None:
603
603
                raise errors.BzrCommandError(
604
604
                    'Cannot use -r with merge directives or bundles')
605
 
            rev_id = mergeable.get_target_revision(
606
 
                branch_to.repository)
 
605
            rev_id = mergeable.install_revisions(branch_to.repository)
607
606
            branch_from = branch_to
608
607
        else:
609
608
            branch_from = Branch.open(location)
2528
2527
                if revision is not None:
2529
2528
                    raise errors.BzrCommandError(
2530
2529
                        'Cannot use -r with merge directives or bundles')
2531
 
                other_rev_id = mergeable.get_target_revision(
 
2530
                other_rev_id = mergeable.install_revisions(
2532
2531
                    tree.branch.repository)
2533
2532
                revision = [RevisionSpec.from_string(
2534
2533
                    'revid:' + other_rev_id)]