← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

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
28
29
from bzrlib.trace import mutter
29
30
from bzrlib.workingtree import WorkingTree
30
31
 
 
32
# We're allowed to test deprecated interfaces
 
33
warnings.filterwarnings('ignore',
 
34
        '.*get_intervening_revisions was deprecated',
 
35
        DeprecationWarning,
 
36
        r'bzrlib\.tests\.test_revision')
 
37
 
31
38
# XXX: Make this a method of a merge base case
32
39
def make_branches(self):
33
40
    """Create two branches