← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_core.py

  • Committer: Aaron Bentley
  • Date: 2005-08-10 15:05:26 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: abentley@panoramicfeedback.com-20050810150526-468a7e2e3dc299e4
Switched to using a set of interesting file_ids instead of SourceFile attribute

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_core.py
85
85
        
86
86
 
87
87
def merge_flex(this, base, other, changeset_function, inventory_function,
88
 
               conflict_handler, merge_factory):
 
88
               conflict_handler, merge_factory, interesting_ids):
89
89
    this_inventory = inventory_function(this)
90
90
    base_inventory = inventory_function(base)
91
91
    other_inventory = inventory_function(other)
92
92
    inventory = ThreewayInventory(make_inv(this_inventory),
93
93
                                  make_inv(base_inventory), 
94
94
                                  make_inv(other_inventory))
95
 
    cset = changeset_function(base, other, base_inventory, other_inventory)
 
95
    cset = changeset_function(base, other, base_inventory, other_inventory, 
 
96
                              interesting_ids)
96
97
    new_cset = make_merge_changeset(cset, inventory, this, base, other, 
97
98
                                    conflict_handler, merge_factory)
98
99
    result = apply_changeset(new_cset, invert_invent(this_inventory),