~bzr-pqm/bzr/1.17

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

merge merge tweaks from aaron, which includes latest .dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
47
47
    conflict that are not explicitly handled cause an exception and
48
48
    terminate the merge.
49
49
    """
50
 
    def __init__(self, dir, ignore_zero=False):
51
 
        ExceptionConflictHandler.__init__(self, dir)
 
50
    def __init__(self, ignore_zero=False):
 
51
        ExceptionConflictHandler.__init__(self)
52
52
        self.conflicts = 0
53
53
        self.ignore_zero = ignore_zero
54
54
 
285
285
                base_rev_id = None
286
286
            else:
287
287
                base_rev_id = base_branch.get_rev_id(base_revision[1])
288
 
            if base_rev_id is not None:
289
 
                base_is_ancestor = is_ancestor(this_rev_id, base_rev_id, 
290
 
                                               MultipleRevisionSources(this_branch, 
291
 
                                                                       base_branch))
292
 
            else:
293
 
                base_is_ancestor = False
 
288
            multi_source = MultipleRevisionSources(this_branch, base_branch)
 
289
            base_is_ancestor = is_ancestor(this_rev_id, base_rev_id,
 
290
                                           multi_source)
294
291
        if file_list is None:
295
292
            interesting_ids = None
296
293
        else:
352
349
 
353
350
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
354
351
                             generate_cset_optimized, get_inventory,
355
 
                             MergeConflictHandler(base_tree.root,
356
 
                                                  ignore_zero=ignore_zero),
 
352
                             MergeConflictHandler(ignore_zero=ignore_zero),
357
353
                             merge_factory=merge_factory, 
358
354
                             interesting_ids=interesting_ids)
359
355