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

Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
260
260
    """
261
261
    # RBC 20051019 is this not just 'export' ?
262
262
    # AB Well, export doesn't take care of inventory...
263
 
    this_branch = Branch.open_containing(to_dir)[0]
264
 
    transform_tree(this_branch.working_tree(), this_branch.basis_tree())
 
263
    this_tree = WorkingTree.open_containing(to_dir)[0]
 
264
    transform_tree(this_tree, this_tree.basis_tree())
265
265
 
266
266
 
267
267
def transform_tree(from_tree, to_tree, interesting_ids=None):
387
387
 
388
388
    def compare_basis(self):
389
389
        changes = compare_trees(self.this_tree, 
390
 
                                self.this_branch.basis_tree(), False)
 
390
                                self.this_tree.basis_tree(), False)
391
391
        if not changes.has_changed():
392
392
            self.this_rev_id = self.this_basis
393
393