/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: Jelmer Vernooij
  • Date: 2018-08-08 02:14:32 UTC
  • mfrom: (7063 work)
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180808021432-nomib3je4cu2xqkm
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_intertree/test_compare.py
1427
1427
        expected = [
1428
1428
            self.unchanged(tree1, tree1.path2id('')),
1429
1429
            self.added(tree2, b'added'),
1430
 
            self.content_changed(tree2, 'changed'),
 
1430
            self.content_changed(tree2, b'changed'),
1431
1431
            self.kind_changed(tree1, tree2, b'fromdir'),
1432
1432
            self.kind_changed(tree1, tree2, b'fromfile'),
1433
1433
            self.deleted(tree1, b'removed'),
1448
1448
        root_id = tree1.path2id('')
1449
1449
        expected = [
1450
1450
            self.added(tree2, b'added'),
1451
 
            self.content_changed(tree2, 'changed'),
 
1451
            self.content_changed(tree2, b'changed'),
1452
1452
            self.kind_changed(tree1, tree2, b'fromdir'),
1453
1453
            self.kind_changed(tree1, tree2, b'fromfile'),
1454
1454
            self.deleted(tree1, b'removed'),