/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/git/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
56
56
    controldir as _mod_controldir,
57
57
    globbing,
58
58
    lock,
59
 
    merge,
60
59
    osutils,
61
60
    revision as _mod_revision,
62
61
    trace,
1204
1203
            show_base=False):
1205
1204
        basis_tree = self.revision_tree(old_revision)
1206
1205
        if new_revision != old_revision:
 
1206
            from .. import merge
1207
1207
            with basis_tree.lock_read():
1208
1208
                new_basis_tree = self.branch.basis_tree()
1209
1209
                merge.merge_inner(
1312
1312
 
1313
1313
    def copy_content_into(self, tree, revision_id=None):
1314
1314
        """Copy the current content and user files of this tree into tree."""
 
1315
        from .. import merge
1315
1316
        with self.lock_read():
1316
1317
            if revision_id is None:
1317
1318
                merge.transform_tree(tree, self)