← 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 trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
import os
19
18
import warnings
20
19
 
21
20
from bzrlib import (
22
21
    bugtracker,
23
22
    revision,
24
 
    symbol_versioning,
25
23
    )
26
 
from bzrlib.branch import Branch
27
24
from bzrlib.errors import (
28
25
    InvalidBugStatus,
29
26
    InvalidLineInBugsProperty,
30
 
    NoSuchRevision,
31
27
    )
32
 
from bzrlib.deprecated_graph import Graph
33
 
from bzrlib.revision import (find_present_ancestors,
34
 
                             NULL_REVISION)
 
28
from bzrlib.revision import NULL_REVISION
35
29
from bzrlib.tests import TestCase, TestCaseWithTransport
36
30
from bzrlib.trace import mutter
37
 
from bzrlib.workingtree import WorkingTree
38
31
 
39
32
# We're allowed to test deprecated interfaces
40
33
warnings.filterwarnings('ignore',