← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2006-05-14 17:18:54 UTC
  • mto: (1185.82.108 w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: aaron.bentley@utoronto.ca-20060514171854-75c011da5cf965a7
Use cset_info.target as target revision

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2584
2584
    pb = bzrlib.ui.ui_factory.nested_progress_bar()
2585
2585
    try:
2586
2586
        _install_info(tree.branch.repository, cset_info, cset_tree)
2587
 
        other_revision_id = cset_info.revisions[0].revision_id
2588
2587
        merger = Merger(tree.branch, this_tree=tree, pb=pb)
2589
2588
        merger.pp = ProgressPhase("Merge phase", 5, pb)
2590
2589
        merger.pp.next_phase()
2591
2590
        merger.check_basis(check_clean)
2592
 
        merger.other_rev_id = other_revision_id
2593
 
        merger.other_tree = merger.revision_tree(other_revision_id)
2594
 
        merger.other_basis = other_revision_id
 
2591
        merger.other_rev_id = cset_info.target
 
2592
        merger.other_tree = merger.revision_tree(cset_info.target)
 
2593
        merger.other_basis = cset_info.target
2595
2594
        merger.pp.next_phase()
2596
2595
        merger.find_base()
2597
2596
        if merger.base_rev_id == merger.other_rev_id: