/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/tests/test_shelf.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:
16
16
 
17
17
import os
18
18
 
19
 
from bzrlib import errors, pack, shelf, tests, transform, workingtree
 
19
from bzrlib import (
 
20
    errors,
 
21
    osutils,
 
22
    pack,
 
23
    shelf,
 
24
    tests,
 
25
    transform,
 
26
    workingtree,
 
27
    )
20
28
 
21
29
 
22
30
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"