← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-09-14 20:06:48 UTC
  • mto: (1185.1.29)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: abentley@panoramicfeedback.com-20050914200648-030b6c1e34fabaa6
Removed unused dir parameter from ExceptionConflictHandler

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
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
 
352
352
 
353
353
    inv_changes = merge_flex(this_tree, base_tree, other_tree,
354
354
                             generate_cset_optimized, get_inventory,
355
 
                             MergeConflictHandler(base_tree.root,
356
 
                                                  ignore_zero=ignore_zero),
 
355
                             MergeConflictHandler(ignore_zero=ignore_zero),
357
356
                             merge_factory=merge_factory, 
358
357
                             interesting_ids=interesting_ids)
359
358