~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

[merge] up-to-date against bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
import time
19
19
 
20
20
from bzrlib.branch import Branch
21
 
from bzrlib.selftest import TestCaseInTempDir
 
21
from bzrlib.tests import TestCaseInTempDir
22
22
from bzrlib.errors import NoCommonAncestor, NoCommits
23
23
from bzrlib.errors import NoSuchRevision
24
24
from bzrlib.clone import copy_branch
84
84
        """Ensure that the branch namespace pulls in the requisite content."""
85
85
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
86
86
        branch = Branch.initialize('branch1')
87
 
        branch.add(['file'])
 
87
        branch.working_tree().add(['file'])
88
88
        branch.working_tree().commit('add file')
89
89
        copy_branch(branch, 'branch2')
90
90
        print >> open('branch2/file', 'w'), 'new content'