/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

  • Committer: Aaron Bentley
  • Date: 2005-10-23 23:41:45 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: aaron.bentley@utoronto.ca-20051023234145-809a01974c2dc38b
Added weave merge conflict to ExceptionConflictHandler

Show diffs side-by-side

added added

removed removed

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