/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_workingtree/test_paths2ids.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-08-07 21:24:40 UTC
  • mfrom: (7058.4.30 python3-x)
  • Revision ID: breezy.the.bot@gmail.com-20180807212440-m7r0c45ihwr0kcre
Fix another round of tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-x/+merge/352226

Show diffs side-by-side

added added

removed removed

Lines of Context:
166
166
        tree.unversion(['dir/child-goes'])
167
167
        tree.rename_one('dir/child-moves', 'child-moves')
168
168
        self.build_tree(['tree/newdir/'])
169
 
        tree.add(['newdir'], ['newdir'])
 
169
        tree.add(['newdir'], [b'newdir'])
170
170
        tree.rename_one('dir/child-stays', 'child-stays')
171
171
        tree.rename_one('dir', 'newdir/dir')
172
172
        tree.rename_one('child-stays', 'newdir/dir/child-stays')
173
173
        self.build_tree(['tree/newdir/dir/new-child'])
174
 
        tree.add(['newdir/dir/new-child'], ['new-child'])
 
174
        tree.add(['newdir/dir/new-child'], [b'new-child'])
175
175
        self.assertExpectedIds(
176
176
            [b'newdir', b'dir', b'child-moves', b'child-stays', b'child-goes',
177
177
             b'new-child'], tree, ['newdir'], [basis])