← 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: 2006-06-16 15:57:16 UTC
  • mfrom: (1777.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060616155716-59b745c6e778fb4e
(robertc,abentley)Teach all trees about unknowns, conflicts and get_parent_ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
23
23
from bzrlib.revision import Revision
24
24
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
25
25
from bzrlib.transport import get_transport
26
 
from bzrlib.tree import EmptyTree
27
26
from bzrlib.workingtree import WorkingTree
28
27
 
29
28