/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/mutabletree.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/mutabletree.py
32
32
    controldir,
33
33
    errors,
34
34
    hooks,
35
 
    inventory as _mod_inventory,
36
35
    osutils,
37
36
    revisiontree,
38
37
    trace,
39
38
    transport as _mod_transport,
40
39
    tree,
41
40
    )
 
41
 
 
42
from breezy.bzr import (
 
43
    inventory as _mod_inventory,
 
44
    )
42
45
""")
43
46
 
44
47
from .decorators import needs_read_lock, needs_write_lock
659
662
            self.conflicts_related = conflicts_related
660
663
 
661
664
    def add(self, file_list, recurse=True):
662
 
        from breezy.inventory import InventoryEntry
 
665
        from breezy.bzr.inventory import InventoryEntry
663
666
        if not file_list:
664
667
            # no paths supplied: add the entire tree.
665
668
            # FIXME: this assumes we are running in a working tree subdir :-/