← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

- merge improved merge base selection from aaron
aaron.bentley@utoronto.ca-20050912025534-43d7275dd948e4ad

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
1065
1065
    def new_contents_conflict(self, filename, other_contents):
1066
1066
        raise NewContentsConflict(filename)
1067
1067
 
1068
 
    def finalize():
 
1068
    def finalize(self):
1069
1069
        pass
1070
1070
 
1071
1071
def apply_changeset(changeset, inventory, dir, conflict_handler=None,