/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/tree.py

  • Committer: Aaron Bentley
  • Date: 2007-12-02 18:23:12 UTC
  • mto: This revision was merged to the branch mainline in revision 3073.
  • Revision ID: aaron.bentley@utoronto.ca-20071202182312-1red2zttrs87iamc
Clean up names and add documentation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
300
300
        'other:' pseudo-revision.
301
301
        """
302
302
        from bzrlib import plan_merge
303
 
        vf = plan_merge._PlanMergeVersionedfile(file_id)
 
303
        vf = plan_merge._PlanMergeVersionedFile(file_id)
304
304
        last_revision_a = self._get_file_revision(file_id, vf, 'this:')
305
305
        last_revision_b = other._get_file_revision(file_id, vf, 'other:')
306
306
        plan = plan_merge.PlanMerge(last_revision_a, last_revision_b, vf)