← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Aaron Bentley
  • Date: 2007-12-09 20:58:03 UTC
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071209205803-9puidarg2y33bpzj
Get cherrypick-on-weave working

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
306
306
        if base is None:
307
307
            last_revision_base = None
308
308
        else:
309
 
            last_revision_base = other._get_file_revision(file_id, vf, 'base:')
 
309
            last_revision_base = base._get_file_revision(file_id, vf, 'base:')
310
310
        return vf.plan_merge(last_revision_a, last_revision_b,
311
311
                             last_revision_base)
312
312