← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Martin Pool
  • Date: 2005-08-25 07:46:11 UTC
  • Revision ID: mbp@sourcefrog.net-20050825074611-98130ea6d05d9d2a
- add functions to enable and disable default logging, so that we can
  turn it off while running the tests

- default logging gets turned on from the bzr main function so that
  other applications using the library can make their own decisions

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(self):
 
1068
    def finalize():
1069
1069
        pass
1070
1070
 
1071
1071
def apply_changeset(changeset, inventory, dir, conflict_handler=None,