← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

Merge fetch-spec-everything-not-in-other.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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