← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-12 01:01:53 UTC
  • mfrom: (5597 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5599.
  • Revision ID: john@arbash-meinel.com-20110112010153-op19823r9e6hy7u6
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
25
25
    revision,
26
26
    tests,
27
27
    )
28
 
from bzrlib.inventory import (CHKInventory, Inventory, ROOT_ID, InventoryFile,
29
 
    InventoryDirectory, InventoryEntry, TreeReference)
 
28
from bzrlib.inventory import (
 
29
    CHKInventory,
 
30
    Inventory,
 
31
    ROOT_ID,
 
32
    InventoryFile,
 
33
    InventoryDirectory,
 
34
    InventoryEntry,
 
35
    TreeReference,
 
36
    )
30
37
from bzrlib.tests import (
31
38
    TestCase,
32
39
    TestCaseWithTransport,
33
 
    condition_isinstance,
34
 
    multiply_tests,
35
40
    )
36
41
from bzrlib.tests.per_workingtree import workingtree_formats
37
42
from bzrlib.tests.scenarios import load_tests_apply_scenarios