/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

  • Committer: Robert Collins
  • Date: 2005-11-05 22:18:12 UTC
  • mto: This revision was merged to the branch mainline in revision 1503.
  • Revision ID: robertc@robertcollins.net-20051105221812-a2a774e6f8d993be
Update comment to reflect author.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
270
270
    lower-level code (e.g. constructing a changeset).
271
271
    """
272
272
    # RBC 20051019 is this not just 'export' ?
273
 
    # Well, export doesn't take care of inventory...
 
273
    # AB Well, export doesn't take care of inventory...
274
274
    this_branch = Branch.open_containing(to_dir)[0]
275
275
    transform_tree(this_branch.working_tree(), this_branch.basis_tree())
276
276
 
 
277
 
277
278
def transform_tree(from_tree, to_tree):
278
279
    merge_inner(from_tree.branch, to_tree, from_tree, ignore_zero=True)
279
280
 
 
281
 
280
282
def merge(other_revision, base_revision,
281
283
          check_clean=True, ignore_zero=False,
282
284
          this_dir=None, backup_files=False, merge_type=ApplyMerge3,