/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/blackbox/test_reconcile.py

  • Committer: Martin
  • Date: 2018-11-16 19:09:31 UTC
  • mfrom: (7175 work)
  • mto: This revision was merged to the branch mainline in revision 7177.
  • Revision ID: gzlist@googlemail.com-20181116190931-rmh7pk2an1zuecby
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_reconcile.py
51
51
        # an empty inventory with no revision will trigger reconciliation.
52
52
        repo = t.branch.repository
53
53
        inv = inventory.Inventory(revision_id=b'missing')
54
 
        inv.root.revision=b'missing'
 
54
        inv.root.revision = b'missing'
55
55
        repo.lock_write()
56
56
        repo.start_write_group()
57
57
        repo.add_inventory(b'missing', inv, [])