/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_merge.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:
breezy/tests/test_merge.py
3080
3080
        builder = self.make_builder()
3081
3081
        builder.add_file(b'bar-id', builder.tree_root, 'bar', b'text1', True,
3082
3082
                         this=False)
3083
 
        builder.add_dir(b'bar-dir', builder.tree_root, b'bar-id',
 
3083
        builder.add_dir(b'bar-dir', builder.tree_root, 'bar-id',
3084
3084
                        base=False, other=False)
3085
3085
        return builder
3086
3086