← 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: Martin Pool
  • Date: 2006-06-20 07:55:43 UTC
  • mfrom: (1798 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1799.
  • Revision ID: mbp@sourcefrog.net-20060620075543-b10f6575d4a4fa32
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
16
16
 
17
17
 
18
18
import os
 
19
import warnings
19
20
 
20
21
from bzrlib.branch import Branch
21
22
from bzrlib.errors import NoSuchRevision
22
 
from bzrlib.commit import commit
23
23
from bzrlib.graph import Graph
24
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
25
25
                             common_ancestor,
28
28
from bzrlib.trace import mutter
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
 
31
# We're allowed to test deprecated interfaces
 
32
warnings.filterwarnings('ignore',
 
33
        '.*get_intervening_revisions was deprecated',
 
34
        DeprecationWarning,
 
35
        r'bzrlib\.tests\.test_revision')
 
36
 
31
37
# XXX: Make this a method of a merge base case
32
38
def make_branches(self):
33
39
    """Create two branches
140
146
class TestIntermediateRevisions(TestCaseWithTransport):
141
147
 
142
148
    def setUp(self):
143
 
        from bzrlib.commit import commit
144
149
        TestCaseWithTransport.setUp(self)
145
150
        self.br1, self.br2 = make_branches(self)
146
151
        wt1 = self.br1.bzrdir.open_workingtree()