/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/test_dirstate.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-21 23:59:28 UTC
  • mfrom: (6973.6.4 python3-e)
  • Revision ID: jelmer@jelmer.uk-20180621235928-f7z0vf0lxc6ieo9e
Merge lp:~jelmer/brz/python3-e

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_dirstate.py
1105
1105
        try:
1106
1106
            tree1.add('')
1107
1107
            tree1.add(['a file'], [b'file-id'], ['file'])
1108
 
            tree1.put_file_bytes_non_atomic('a file', 'file-content')
 
1108
            tree1.put_file_bytes_non_atomic('a file', b'file-content')
1109
1109
            revid1 = tree1.commit('foo')
1110
1110
        finally:
1111
1111
            tree1.unlock()
1113
1113
        tree2 = memorytree.MemoryTree.create_on_branch(branch2)
1114
1114
        tree2.lock_write()
1115
1115
        try:
1116
 
            tree2.put_file_bytes_non_atomic('a file', 'new file-content')
 
1116
            tree2.put_file_bytes_non_atomic('a file', b'new file-content')
1117
1117
            revid2 = tree2.commit('foo')
1118
1118
            root_id = tree2.get_root_id()
1119
1119
        finally: