~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:
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/'])