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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-02 01:11:40 UTC
  • mfrom: (7023 work)
  • mto: This revision was merged to the branch mainline in revision 7025.
  • Revision ID: jelmer@jelmer.uk-20180702011140-toroicnrq9a5jstj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_workingtree_4.py
126
126
        subtree.lock_write()
127
127
        self.addCleanup(subtree.unlock)
128
128
        self.build_tree(['subdir/file-a',])
129
 
        subtree.add(['file-a'], ['id-a'])
 
129
        subtree.add(['file-a'], [b'id-a'])
130
130
        rev1 = subtree.commit('commit in subdir')
131
131
 
132
132
        subtree2 = subtree.controldir.sprout('subdir2').open_workingtree()
133
133
        self.build_tree(['subdir2/file-b'])
134
 
        subtree2.add(['file-b'], ['id-b'])
 
134
        subtree2.add(['file-b'], [b'id-b'])
135
135
        rev2 = subtree2.commit('commit in subdir2')
136
136
 
137
137
        subtree.flush()