← 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_revision.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_reference/test_add_revision.py
34
34
        self.addCleanup(tree.unlock)
35
35
        rev = tree.branch.repository.get_revision(revid)
36
36
        base = self.make_repository('base')
37
 
        repo = self.make_referring('referring', 'base')
 
37
        repo = self.make_referring('referring', base)
38
38
        repo.lock_write()
39
39
        try:
40
40
            repo.start_write_group()