/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/test_inventory_delta.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/test_inventory_delta.py
391
391
        new_inv.add(root)
392
392
        class StrangeInventoryEntry(inventory.InventoryEntry):
393
393
            kind = 'strange'
394
 
        non_root = StrangeInventoryEntry('id', u'foo', root.file_id)
 
394
        non_root = StrangeInventoryEntry(b'id', u'foo', root.file_id)
395
395
        non_root.revision = b'changed'
396
396
        new_inv.add(non_root)
397
397
        delta = new_inv._make_delta(old_inv)