← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Martin Pool
  • Date: 2007-07-11 04:15:48 UTC
  • mto: This revision was merged to the branch mainline in revision 2605.
  • Revision ID: mbp@sourcefrog.net-20070711041548-n1om2ptyj2j01r6l
Clean up old/unused global options

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
25
25
from bzrlib import (
26
26
    delta,
27
27
    osutils,
28
 
    revision as _mod_revision,
29
28
    symbol_versioning,
30
29
    )
31
30
from bzrlib.decorators import needs_read_lock
245
244
        """
246
245
        raise NotImplementedError(self.annotate_iter)
247
246
 
248
 
    def plan_file_merge(self, file_id, other):
249
 
        """Generate a merge plan based on annotations
250
 
 
251
 
        If the file contains uncommitted changes in this tree, they will be
252
 
        attributed to the 'current:' pseudo-revision.  If the file contains
253
 
        uncommitted changes in the other tree, they will be assigned to the
254
 
        'other:' pseudo-revision.
255
 
        """
256
 
        from bzrlib import merge
257
 
        annotated_a = list(self.annotate_iter(file_id,
258
 
                                              _mod_revision.CURRENT_REVISION))
259
 
        annotated_b = list(other.annotate_iter(file_id, 'other:'))
260
 
        ancestors_a = self._get_ancestors(_mod_revision.CURRENT_REVISION)
261
 
        ancestors_b = other._get_ancestors('other:')
262
 
        return merge._plan_annotate_merge(annotated_a, annotated_b,
263
 
                                          ancestors_a, ancestors_b)
264
 
 
265
247
    inventory = property(_get_inventory,
266
248
                         doc="Inventory of this Tree")
267
249