← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository_reference/test_add_inventory.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_reference/test_add_inventory.py
33
33
        tree.lock_read()
34
34
        self.addCleanup(tree.unlock)
35
35
        base = self.make_repository('base')
36
 
        repo = self.make_referring('referring', 'base')
 
36
        repo = self.make_referring('referring', base)
37
37
        repo.lock_write()
38
38
        try:
39
39
            repo.start_write_group()