~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/merge.py

Committer: Aaron Bentley
Date: 2006-01-09 06:52:28 UTC
mto: (1534.9.2 Transactional Tree Transforms) (1558.1.4 Aaron's integration) (1185.50.82 bzr-jam-integration) (2027.1.2 revert-subpath-56549)
mto: This revision was merged to the branch mainline in revision 1558.
Revision ID: aaron.bentley@utoronto.ca-20060109065228-7118afeb71312dd9

Nearly-working build_tree replacement

added added

removed removed

267

"""

268

# RBC 20051019 is this not just 'export' ?

269

# AB Well, export doesn't take care of inventory...

270

from transform import build_tree

270

271

this_branch = Branch.open_containing(to_dir)[0]

271

transform_tree(this_branch.working_tree(), this_branch.basis_tree())

272

build_tree(this_branch, this_branch.basis_tree())

272

273

274

275

def transform_tree(from_tree, to_tree, interesting_ids=None):