← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

[merge] from robert

 - fix handling of symlinks in tree

 - improved executable bits

 - cache pull over http and test for this

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
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
 
 
425
415
def merge_inner(this_branch, other_tree, base_tree, tempdir, 
426
416
                ignore_zero=False, merge_type=ApplyMerge3, backup_files=False,
427
417
                interesting_ids=None):
438
428
        return tree.tree.inventory
439
429
 
440
430
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
441
 
                             generate_cset_optimized, get_inventory,
 
431
                             generate_changeset, get_inventory,
442
432
                             MergeConflictHandler(this_tree, base_tree,
443
433
                             other_tree, ignore_zero=ignore_zero),
444
434
                             merge_factory=merge_factory,