← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-06-05 04:05:05 UTC
  • mfrom: (3473.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080605040505-i9kqxg2fps2qjdi0
Add the 'alias' command (Tim Penhey)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
20
20
from bzrlib import bzrdir, errors, tests
21
21
from bzrlib.reconcile import reconcile, Reconciler
22
22
from bzrlib.revision import Revision
23
 
from bzrlib.tests.per_repository import TestCaseWithRepository
 
23
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
24
24
from bzrlib.transport import get_transport
25
25
from bzrlib.workingtree import WorkingTree
26
26