/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 bzrlib/tests/per_repository/test_reconcile.py

  • Committer: Martin Pool
  • Date: 2009-09-11 07:55:48 UTC
  • mfrom: (4634.43.1 2.0)
  • mto: This revision was merged to the branch mainline in revision 4689.
  • Revision ID: mbp@sourcefrog.net-20090911075548-kzznjy7emvpqnz1n
merge 2.0rc2, sphinx, and various fixes back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_reconcile.py
341
341
        repo.start_write_group()
342
342
        inv = Inventory(revision_id='wrong-first-parent')
343
343
        inv.root.revision = 'wrong-first-parent'
 
344
        if repo.supports_rich_root():
 
345
            root_id = inv.root.file_id
 
346
            repo.texts.add_lines((root_id, 'wrong-first-parent'), [], [])
344
347
        sha1 = repo.add_inventory('wrong-first-parent', inv, ['2', '1'])
345
348
        rev = Revision(timestamp=0,
346
349
                       timezone=None,