← 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-19 06:01:01 UTC
  • Revision ID: robertc@robertcollins.net-20051019060101-1f62d4fb1a5f59dc
WorkingTree.__del__ has been removed.

It was non deterministic and not doing what it was intended 
to. See WorkingTree.__init__ for a comment about future directions.
(Robert Collins/Martin Pool)

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
415
414
    def __init__(self, file_id, base, other):
416
415
        self.file_id = file_id
417
416
        self.base = base
1083
1082
        msg = "Conflicting contents for new file %s" % (filename)
1084
1083
        Exception.__init__(self, msg)
1085
1084
 
1086
 
class WeaveMergeConflict(Exception):
1087
 
    def __init__(self, filename):
1088
 
        msg = "Conflicting contents for file %s" % (filename)
1089
 
        Exception.__init__(self, msg)
1090
 
 
1091
1085
class ThreewayContentsConflict(Exception):
1092
1086
    def __init__(self, filename):
1093
1087
        msg = "Conflicting contents for file %s" % (filename)
1164
1158
    def new_contents_conflict(self, filename, other_contents):
1165
1159
        raise NewContentsConflict(filename)
1166
1160
 
1167
 
    def weave_merge_conflict(self, filename, weave, other_i, out_file):
1168
 
        raise WeaveMergeConflict(filename)
1169
 
 
1170
1161
    def threeway_contents_conflict(self, filename, this_contents,
1171
1162
                                   base_contents, other_contents):
1172
1163
        raise ThreewayContentsConflict(filename)