/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_pull.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_pull.py
61
61
        tree = self.make_branch_and_tree('from')
62
62
        if not tree._format.supports_versioned_directories:
63
63
            self.skipTest('format does not support custom root ids')
64
 
        tree.set_root_id('first_root_id')
 
64
        tree.set_root_id(b'first_root_id')
65
65
        self.build_tree(['from/file'])
66
66
        tree.add(['file'])
67
67
        tree.commit('first')
68
68
        to_tree = tree.controldir.sprout('to').open_workingtree()
69
69
        self.assertEqual('first_root_id', to_tree.get_root_id())
70
 
        tree.set_root_id('second_root_id')
 
70
        tree.set_root_id(b'second_root_id')
71
71
        tree.commit('second')
72
72
        to_tree.pull(tree.branch)
73
73
        self.assertEqual('second_root_id', to_tree.get_root_id())