~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/trace.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
295
295
    This flushes, but does not close the trace file.
296
296
    
297
297
    Takes the memento returned from _push_log_file."""
298
 
    assert magic == 'log_memento'
299
298
    global _trace_file
300
299
    _trace_file = old_trace_file
301
300
    bzr_logger = logging.getLogger('bzr')