← 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_get_rev_id_for_revno.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_get_rev_id_for_revno.py
31
31
        spare_tree = tree.bzrdir.sprout('spare').open_workingtree()
32
32
        revid3 = spare_tree.commit('three')
33
33
        branch = spare_tree.branch.create_clone_on_transport(
34
 
            self.get_transport('referring'), stacked_on=self.get_url('base'))
 
34
            self.get_transport('referring'),
 
35
            stacked_on=tree.branch.base)
35
36
        repo = branch.repository
36
37
        # Sanity check: now repo has 'revid3', and base has 'revid' + 'revid2'
37
38
        self.assertEqual(set([revid3]),