← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisiontree.py

merge only needs a lock_tree_write() on the working tree, not a full lock_write()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisiontree.py
22
22
    )
23
23
import bzrlib
24
24
from bzrlib.tests import TestCaseWithTransport
 
25
from bzrlib.tree import RevisionTree
25
26
 
26
27
 
27
28
class TestTreeWithCommits(TestCaseWithTransport):
50
51
            self.t.branch.repository.revision_tree(revid_2).get_parent_ids())
51
52
        # TODO commit a merge and check it is reported correctly.
52
53
 
53
 
        # the parents for a revision_tree(NULL_REVISION) are []:
 
54
        # the parents for a revision_tree(None) are []:
54
55
        self.assertEqual([],
55
 
            self.t.branch.repository.revision_tree(
56
 
                revision.NULL_REVISION).get_parent_ids())
 
56
            self.t.branch.repository.revision_tree(None).get_parent_ids())
57
57
 
58
58
    def test_empty_no_root(self):
59
59
        null_tree = self.t.branch.repository.revision_tree(