← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Lalo Martins
  • Date: 2005-09-08 11:08:13 UTC
  • mto: (1185.1.22)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: lalo@exoweb.net-20050908110811-49e867a4d2c07bf2
getting rid of branch.lookup_revision()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
139
139
    elif revno == -1:
140
140
        revision = branch.last_patch()
141
141
    else:
142
 
        revision = branch.lookup_revision(revno)
 
142
        revision = branch.get_rev_id(revno)
143
143
    return branch, get_revid_tree(branch, revision, temp_root, label,
144
144
                                  local_branch)
145
145
 
258
258
            other_rev_id = other_branch.last_patch()
259
259
            other_basis = other_rev_id
260
260
        elif other_revision[1] is not None:
261
 
            other_rev_id = other_branch.lookup_revision(other_revision[1])
 
261
            other_rev_id = other_branch.get_rev_id(other_revision[1])
262
262
            other_basis = other_rev_id
263
263
        else:
264
264
            other_rev_id = None
278
278
            elif base_revision[1] is None:
279
279
                base_rev_id = None
280
280
            else:
281
 
                base_rev_id = base_branch.lookup_revision(base_revision[1])
 
281
                base_rev_id = base_branch.get_rev_id(base_revision[1])
282
282
            if base_rev_id is not None:
283
283
                base_is_ancestor = is_ancestor(this_rev_id, base_rev_id, 
284
284
                                               MultipleRevisionSources(this_branch,