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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

Merged from https://code.launchpad.net/~jelmer/brz/more-bees/+merge/337919

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_unversion.py
169
169
                    tree_a,
170
170
                    [('', ''), ('xyz/', None), ('xyz/m', 'a/m')]))
171
171
 
172
 
        self.build_tree_contents([('A/a/n', 'new contents for n\n')])
 
172
        self.build_tree_contents([('A/a/n', b'new contents for n\n')])
173
173
        tree_a.commit('change n in A')
174
174
 
175
175
        # Merging from A should introduce conflicts because 'n' was modified