← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
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
32
32
 
33
33
        These identify revisions by date, etc."""
34
34
 
35
 
        b = Branch.initialize('.')
 
35
        b = Branch.initialize(u'.')
36
36
 
37
37
        b.working_tree().commit('Commit one', rev_id='a@r-0-1', timestamp=time.time() - 60*60*24)
38
38
        b.working_tree().commit('Commit two', rev_id='a@r-0-2')
80
80
        self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,
81
81
                          'b@r-0-4')
82
82
 
 
83
        # This should be in the revision store, but not in revision-history
 
84
        self.assertEquals((None, 'b@r-0-4'),
 
85
                RevisionSpec('revid:b@r-0-4').in_history(b))
 
86
 
83
87
    def test_branch_namespace(self):
84
88
        """Ensure that the branch namespace pulls in the requisite content."""
85
89
        self.build_tree(['branch1/', 'branch1/file', 'branch2/'])