← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-09 13:49:07 UTC
  • mfrom: (4679.1.1 merge-2.0-into-bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090909134907-nnrr06jw5o011doh
(andrew) Merge 2.0 tip, including fixes for 408841, 423506, 406687,
        418931.

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,