/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/multiparent.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:
bzrlib/multiparent.py
28
28
    trace,
29
29
    ui,
30
30
    )
31
 
from bzrlib import bencode
 
31
from bzrlib.util import bencode
32
32
""")
33
33
from bzrlib.tuned_gzip import GzipFile
34
34