/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/test_revision.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-22 18:24:25 UTC
  • mfrom: (1803 +trunk)
  • mto: (1793.3.6 bundle-fixes)
  • mto: This revision was merged to the branch mainline in revision 1806.
  • Revision ID: john@arbash-meinel.com-20060622182425-6f45cb7acd587216
[merge] bzr.dev 1804 and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
20
20
 
21
21
from bzrlib.branch import Branch
22
22
from bzrlib.errors import NoSuchRevision
23
 
from bzrlib.commit import commit
24
23
from bzrlib.graph import Graph
25
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
26
25
                             common_ancestor,
147
146
class TestIntermediateRevisions(TestCaseWithTransport):
148
147
 
149
148
    def setUp(self):
150
 
        from bzrlib.commit import commit
151
149
        TestCaseWithTransport.setUp(self)
152
150
        self.br1, self.br2 = make_branches(self)
153
151
        wt1 = self.br1.bzrdir.open_workingtree()