~bzr-pqm/bzr/bzr.dev

Committer: Robert Collins
Date: 2006-01-04 23:32:25 UTC
mfrom: (1185.50.38 bzr-jam-integration)
mto: (1185.85.11 bzr-encoding) (1534.1.2 integration) (1508.1.16 checkout) (1530.2.2 test-apis) (1551.1.1 bzr.merge.branch-formats) (1553.5.2 bzr.dev (Main development branch)) (1559.1.1 integration) (1556.1.2 versioned-file-new-repo-format) (1704.1.1 integration)
mto: This revision was merged to the branch mainline in revision 1536.
Revision ID: robertc@robertcollins.net-20060104233225-7ce047eb1fca63ec

Merge from jam-integration.

files renamed:
bzrlib/tests/test_revision_info.py => bzrlib/tests/blackbox/test_revision_info.py

added added

removed removed

self.assertEquals(RevisionSpec('ancestor:.').in_history(b3).rev_id,

'b@r-0-4')

# This should be in the revision store, but not in revision-history

self.assertEquals((None, 'b@r-0-4'),

RevisionSpec('revid:b@r-0-4').in_history(b))

def test_branch_namespace(self):

"""Ensure that the branch namespace pulls in the requisite content."""

self.build_tree(['branch1/', 'branch1/file', 'branch2/'])