← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_branch.py

  • Committer: Aaron Bentley
  • Date: 2007-08-20 13:07:12 UTC
  • mfrom: (2732 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2733.
  • Revision ID: abentley@panoramicfeedback.com-20070820130712-buopmg528zcgwyxc
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
28
28
 
29
29
class TestBranch(ExternalBase):
30
30
 
31
 
    def example_branch(test):
32
 
        test.run_bzr('init')
33
 
        file('hello', 'wt').write('foo')
34
 
        test.run_bzr('add hello')
35
 
        test.run_bzr('commit -m setup hello')
36
 
        file('goodbye', 'wt').write('baz')
37
 
        test.run_bzr('add goodbye')
38
 
        test.run_bzr('commit -m setup goodbye')
 
31
    def example_branch(self, path='.'):
 
32
        tree = self.make_branch_and_tree(path)
 
33
        self.build_tree_contents([(path + '/hello', 'foo')])
 
34
        tree.add('hello')
 
35
        tree.commit(message='setup')
 
36
        self.build_tree_contents([(path + '/goodbye', 'baz')])
 
37
        tree.add('goodbye')
 
38
        tree.commit(message='setup')
39
39
 
40
40
    def test_branch(self):
41
41
        """Branch from one branch to another."""
42
 
        os.mkdir('a')
43
 
        os.chdir('a')
44
 
        self.example_branch()
45
 
        os.chdir('..')
 
42
        self.example_branch('a')
46
43
        self.run_bzr('branch a b')
47
44
        b = branch.Branch.open('b')
48
45
        self.assertEqual('b\n', b.control_files.get_utf8('branch-name').read())
49
46
        self.run_bzr('branch a c -r 1')
50
 
        os.chdir('b')
51
 
        self.run_bzr('commit -m foo --unchanged')
52
 
        os.chdir('..')
 
47
        b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
53
48
 
54
49
    def test_branch_only_copies_history(self):
55
50
        # Knit branches should only push the history for the current revision.