/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: Jelmer Vernooij
  • Date: 2018-07-08 15:47:10 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708154710-zebexq602tcer8hv
Fix more merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_pull.py
55
55
    def test_pull_merges_tree_content(self):
56
56
        tree_a, tree_b, rev_a = self.get_pullable_trees()
57
57
        tree_b.pull(tree_a.branch)
58
 
        self.assertFileEqual('contents of from/file\n', 'to/file')
 
58
        self.assertFileEqual(b'contents of from/file\n', 'to/file')
59
59
 
60
60
    def test_pull_changes_root_id(self):
61
61
        tree = self.make_branch_and_tree('from')