← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Martin Pool
  • Date: 2006-06-20 07:55:43 UTC
  • mfrom: (1798 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1799.
  • Revision ID: mbp@sourcefrog.net-20060620075543-b10f6575d4a4fa32
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
124
124
    def change_perms_tree(self, id, tree, mode):
125
125
        os.chmod(tree.full_path(id), mode)
126
126
 
127
 
    def merge_changeset(self, merge_factory):
128
 
        conflict_handler = changeset.ExceptionConflictHandler()
129
 
        return make_merge_changeset(self.cset, self.this, self.base,
130
 
                                    self.other, conflict_handler,
131
 
                                    merge_factory)
132
 
 
133
127
    def apply_inv_change(self, inventory_change, orig_inventory):
134
128
        orig_inventory_by_path = {}
135
129
        for file_id, path in orig_inventory.iteritems():
168
162
            new_inventory[file_id] = path
169
163
        return new_inventory
170
164
 
171
 
    def apply_changeset(self, cset, conflict_handler=None):
172
 
        inventory_change = changeset.apply_changeset(cset,
173
 
                                                     self.this.inventory_dict,
174
 
                                                     self.this.dir,
175
 
                                                     conflict_handler)
176
 
        self.this.inventory_dict =  self.apply_inv_change(inventory_change, 
177
 
                                                     self.this.inventory_dict)
178
 
 
179
165
    def cleanup(self):
180
166
        rmtree(self.dir)
181
167