/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_checkout.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 15:21:06 UTC
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218152106-m8bmfurzlspweyu4
Yet more bees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
41
41
    def setUp(self):
42
42
        super(TestCheckout, self).setUp()
43
43
        tree = controldir.ControlDir.create_standalone_workingtree('branch')
44
 
        tree.commit('1', rev_id='1', allow_pointless=True)
 
44
        tree.commit('1', rev_id=b'1', allow_pointless=True)
45
45
        self.build_tree(['branch/added_in_2'])
46
46
        tree.add('added_in_2')
47
 
        tree.commit('2', rev_id='2')
 
47
        tree.commit('2', rev_id=b'2')
48
48
 
49
49
    def test_checkout_makes_bound_branch(self):
50
50
        self.run_bzr('checkout branch checkout')
118
118
 
119
119
    def _test_checkout_existing_dir(self, lightweight):
120
120
        source = self.make_branch_and_tree('source')
121
 
        self.build_tree_contents([('source/file1', 'content1'),
122
 
                                  ('source/file2', 'content2'),])
 
121
        self.build_tree_contents([('source/file1', b'content1'),
 
122
                                  ('source/file2', b'content2'),])
123
123
        source.add(['file1', 'file2'])
124
124
        source.commit('added files')
125
 
        self.build_tree_contents([('target/', ''),
126
 
                                  ('target/file1', 'content1'),
127
 
                                  ('target/file2', 'content3'),])
 
125
        self.build_tree_contents([('target/', b''),
 
126
                                  ('target/file1', b'content1'),
 
127
                                  ('target/file2', b'content3'),])
128
128
        cmd = ['checkout', 'source', 'target']
129
129
        if lightweight:
130
130
            cmd.append('--lightweight')