~bzr-pqm/bzr/bzr.dev

Committer: Martin Pool
Date: 2005-11-24 01:41:11 UTC
mfrom: (1508.1.15)
mto: (1185.74.1 bzr.dev (Main development branch)) (1505.1.19 bzr-bound-branch) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1534.1.1 integration) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1512.
Revision ID: mbp@sourcefrog.net-20051124014111-b73f6da5f344f5ce

[merge] refactoring of branch vs working tree, etc (robertc)

added added

removed removed

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

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

branch = Branch.initialize('branch1')

branch.add(['file'])

branch.working_tree().add(['file'])

branch.working_tree().commit('add file')

copy_branch(branch, 'branch2')

print >> open('branch2/file', 'w'), 'new content'