/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

Trivial cleanups.

* bzrlib/tests/test_shelf.py: 
Fix imports.

* bzrlib/tests/test_osutils.py: 
Fix imports.

* bzrlib/tests/test_dirstate.py: 
Fix imports.

* bzrlib/tests/test_bundle.py: 
Fix imports.

* bzrlib/merge_directive.py:
(MergeDirectiveFormatRegistry): Add Aaron explanation for the
double registration.

* bzrlib/hashcache.py:
Fix imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
# TODO: make the guts of this methods on tree, branch.
20
20
 
 
21
import os
 
22
 
21
23
from bzrlib import (
22
24
    errors,
23
25
    revision as _mod_revision,