← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Robert Collins
  • Date: 2005-10-27 19:45:18 UTC
  • mfrom: (1185.16.130)
  • Revision ID: robertc@robertcollins.net-20051027194518-58afabc9ab280bb0
Merge from Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
411
411
 
412
412
 
413
413
class Diff3Merge(object):
 
414
    history_based = False
414
415
    def __init__(self, file_id, base, other):
415
416
        self.file_id = file_id
416
417
        self.base = base
1082
1083
        msg = "Conflicting contents for new file %s" % (filename)
1083
1084
        Exception.__init__(self, msg)
1084
1085
 
 
1086
class WeaveMergeConflict(Exception):
 
1087
    def __init__(self, filename):
 
1088
        msg = "Conflicting contents for file %s" % (filename)
 
1089
        Exception.__init__(self, msg)
 
1090
 
1085
1091
class ThreewayContentsConflict(Exception):
1086
1092
    def __init__(self, filename):
1087
1093
        msg = "Conflicting contents for file %s" % (filename)
1158
1164
    def new_contents_conflict(self, filename, other_contents):
1159
1165
        raise NewContentsConflict(filename)
1160
1166
 
 
1167
    def weave_merge_conflict(self, filename, weave, other_i, out_file):
 
1168
        raise WeaveMergeConflict(filename)
 
1169
 
1161
1170
    def threeway_contents_conflict(self, filename, this_contents,
1162
1171
                                   base_contents, other_contents):
1163
1172
        raise ThreewayContentsConflict(filename)