/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/per_workingtree/test_paths2ids.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-15 07:32:26 UTC
  • mfrom: (4536 +trunk)
  • mto: (4536.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4537.
  • Revision ID: v.ladeuil+lp@free.fr-20090715073226-a7ylxd6ctbzeu0o6
Merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_paths2ids.py
24
24
from operator import attrgetter
25
25
 
26
26
from bzrlib import errors
27
 
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
 
27
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
28
28
 
29
29
 
30
30
# TODO: This needs an additional test: do a merge, then do a