~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-10-09 23:12:35 UTC
  • Revision ID: robertc@robertcollins.net-20051009231235-93626e72cac71b78
clean up test dirs on make clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
412
412
             source_file.interesting = source_file.id in interesting_ids
413
413
 
414
414
 
 
415
def generate_cset_optimized(tree_a, tree_b, interesting_ids=None):
 
416
    """Generate a changeset.  If interesting_ids is supplied, only changes
 
417
    to those files will be shown.  Metadata changes are stripped.
 
418
    """ 
 
419
    cset =  generate_changeset(tree_a, tree_b, interesting_ids)
 
420
    for entry in cset.entries.itervalues():
 
421
        entry.metadata_change = None
 
422
    return cset
 
423
 
 
424
 
415
425
def merge_inner(this_branch, other_tree, base_tree, tempdir, 
416
426
                ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
417
427
                interesting_ids=None):
428
438
        return tree.tree.inventory
429
439
 
430
440
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
431
 
                             generate_changeset, get_inventory,
 
441
                             generate_cset_optimized, get_inventory,
432
442
                             MergeConflictHandler(this_tree, base_tree,
433
443
                             other_tree, ignore_zero=ignore_zero),
434
444
                             merge_factory=merge_factory,