← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

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
23
24
from bzrlib.graph import Graph
24
25
from bzrlib.revision import (find_present_ancestors, combined_graph,
25
26
                             common_ancestor,
146
147
class TestIntermediateRevisions(TestCaseWithTransport):
147
148
 
148
149
    def setUp(self):
 
150
        from bzrlib.commit import commit
149
151
        TestCaseWithTransport.setUp(self)
150
152
        self.br1, self.br2 = make_branches(self)
151
153
        wt1 = self.br1.bzrdir.open_workingtree()