← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Aaron Bentley
  • Date: 2005-10-13 21:58:18 UTC
  • mfrom: (1447)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@troll-20051013215818-0900f030e3923901
Fixed symlink reverting

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
1064
1064
        msg = "Conflicting contents for new file %s" % (filename)
1065
1065
        Exception.__init__(self, msg)
1066
1066
 
 
1067
class ThreewayContentsConflict(Exception):
 
1068
    def __init__(self, filename):
 
1069
        msg = "Conflicting contents for file %s" % (filename)
 
1070
        Exception.__init__(self, msg)
 
1071
 
1067
1072
 
1068
1073
class MissingForMerge(Exception):
1069
1074
    def __init__(self, filename):
1135
1140
    def new_contents_conflict(self, filename, other_contents):
1136
1141
        raise NewContentsConflict(filename)
1137
1142
 
 
1143
    def threeway_contents_conflict(self, filename, this_contents,
 
1144
                                   base_contents, other_contents):
 
1145
        raise ThreewayContentsConflict(filename)
 
1146
 
1138
1147
    def finalize(self):
1139
1148
        pass
1140
1149