/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/per_branch/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-29 20:24:31 UTC
  • mfrom: (6999 work)
  • mto: This revision was merged to the branch mainline in revision 7008.
  • Revision ID: jelmer@jelmer.uk-20180629202431-2td8kihrsthzuvau
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_commit.py
189
189
            # setting up a playground
190
190
            tree.add('rootfile')
191
191
            rootfile_id = tree.path2id('rootfile')
192
 
            tree.put_file_bytes_non_atomic('rootfile', 'abc')
 
192
            tree.put_file_bytes_non_atomic('rootfile', b'abc')
193
193
            tree.add('dir')
194
194
            dir_id = tree.path2id('dir')
195
195
            tree.add('dir/subfile')
196
196
            dir_subfile_id = tree.path2id('dir/subfile')
197
 
            tree.put_file_bytes_non_atomic('to_be_unversioned', 'blah')
 
197
            tree.put_file_bytes_non_atomic('to_be_unversioned', b'blah')
198
198
            tree.add(['to_be_unversioned'])
199
199
            to_be_unversioned_id = tree.path2id('to_be_unversioned')
200
 
            tree.put_file_bytes_non_atomic('dir/subfile', 'def')
 
200
            tree.put_file_bytes_non_atomic('dir/subfile', b'def')
201
201
            revid1 = tree.commit('first revision')
202
202
 
203
203
        with tree.lock_write():
204
204
            # making changes
205
 
            tree.put_file_bytes_non_atomic('rootfile', 'jkl')
 
205
            tree.put_file_bytes_non_atomic('rootfile', b'jkl')
206
206
            tree.rename_one('dir/subfile', 'dir/subfile_renamed')
207
207
            tree.unversion(['to_be_unversioned'])
208
208
            tree.mkdir('added_dir')