/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_intertree/test_compare.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_intertree/test_compare.py
755
755
        tree2 = self.get_tree_no_parents_abc_content(tree2)
756
756
        # the pathname is chosen to fall between 'a' and 'b'.
757
757
        self.build_tree(['1/a-empty/', '2/a-empty/'])
758
 
        tree1.add(['a-empty'], ['a-empty'])
759
 
        tree2.add(['a-empty'], ['a-empty'])
 
758
        tree1.add(['a-empty'], [b'a-empty'])
 
759
        tree2.add(['a-empty'], [b'a-empty'])
760
760
        tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
761
761
        expected = []
762
762
        self.assertEqual(expected, self.do_iter_changes(tree1, tree2))