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

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tree.py
31
31
    delta,
32
32
    errors,
33
33
    filters,
34
 
    inventory,
35
34
    osutils,
36
35
    revision as _mod_revision,
37
36
    rules,
38
37
    trace,
39
38
    )
 
39
from breezy.bzr import (
 
40
    inventory,
 
41
    )
40
42
from breezy.i18n import gettext
41
43
""")
42
44
 
429
431
        raise NotImplementedError(self.annotate_iter)
430
432
 
431
433
    def _get_plan_merge_data(self, file_id, other, base):
432
 
        from breezy import versionedfile
 
434
        from .bzr import versionedfile
433
435
        vf = versionedfile._PlanMergeVersionedFile(file_id)
434
436
        last_revision_a = self._get_file_revision(file_id, vf, 'this:')
435
437
        last_revision_b = other._get_file_revision(file_id, vf, 'other:')