/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

remove more duplicate merged hunks. Bad MERGE3, BAD.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
1003
1003
    descend from this class if they have a better way to handle some or
1004
1004
    all types of conflict.
1005
1005
    """
 
1006
    def __init__(self, dir):
 
1007
        self.dir = dir
 
1008
    
1006
1009
    def missing_parent(self, pathname):
1007
1010
        parent = os.path.dirname(pathname)
1008
1011
        raise Exception("Parent directory missing for %s" % pathname)
1081
1084
    :rtype: Dictionary
1082
1085
    """
1083
1086
    if conflict_handler is None:
1084
 
        conflict_handler = ExceptionConflictHandler()
 
1087
        conflict_handler = ExceptionConflictHandler(dir)
1085
1088
    temp_dir = os.path.join(dir, "bzr-tree-change")
1086
1089
    try:
1087
1090
        os.mkdir(temp_dir)