/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_tree/test_tree.py

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_tree.py
65
65
        tree_b.lock_read()
66
66
        self.addCleanup(tree_b.unlock)
67
67
        self.assertEqual([
68
 
            ('killed-a', 'a\n'),
69
 
            ('killed-b', 'b\n'),
70
 
            ('unchanged', 'c\n'),
71
 
            ('unchanged', 'd\n'),
72
 
            ('new-a', 'e\n'),
73
 
            ('new-b', 'f\n'),
 
68
            ('killed-a', b'a\n'),
 
69
            ('killed-b', b'b\n'),
 
70
            ('unchanged', b'c\n'),
 
71
            ('unchanged', b'd\n'),
 
72
            ('new-a', b'e\n'),
 
73
            ('new-b', b'f\n'),
74
74
        ], list(tree_a.plan_file_merge(file_id, tree_b)))
75
75
 
76
76
 
115
115
        tree = self.make_branch_and_tree('tree')
116
116
        root_id = tree.get_root_id()
117
117
        if root_id is not None:
118
 
            self.assertIsInstance(root_id, str)
 
118
            self.assertIsInstance(root_id, bytes)
119
119
 
120
120
    def test_is_versioned(self):
121
121
        tree = self.make_branch_and_tree('tree')