← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-08-05 19:01:45 UTC
  • Revision ID: mbp@sourcefrog.net-20050805190145-bd11d83d724b5317
Doc

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1
1
from merge_core import merge_flex, ApplyMerge3, BackupBeforeChange
2
 
from changeset import generate_changeset, ExceptionConflictHandler
3
 
from changeset import Inventory, Diff3Merge
 
2
from bzrlib.changeset import generate_changeset, ExceptionConflictHandler
 
3
from bzrlib.changeset import Inventory, Diff3Merge
4
4
from bzrlib import find_branch
5
5
import bzrlib.osutils
6
6
from bzrlib.errors import BzrCommandError
19
19
 
20
20
 
21
21
class MergeConflictHandler(ExceptionConflictHandler):
22
 
    """Handle conflicts encountered while merging"""
 
22
    """Handle conflicts encountered while merging.
 
23
 
 
24
    This subclasses ExceptionConflictHandler, so that any types of
 
25
    conflict that are not explicitly handled cause an exception and
 
26
    terminate the merge.
 
27
 
 
28
    """
23
29
    def __init__(self, dir, ignore_zero=False):
24
30
        ExceptionConflictHandler.__init__(self, dir)
25
31
        self.conflicts = 0