Viewing all changes in revision 4297.1.1.

Committer: Vincent Ladeuil
Date: 2009-04-17 14:03:32 UTC
mto: (4297.2.1 integration) (4241.14.22 355454-unicode-warning)
mto: This revision was merged to the branch mainline in revision 4298.
Revision ID: v.ladeuil+lp@free.fr-20090417140332-ey5zutiy0ygxnml0

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.