← 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_graph.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_graph.py
20
20
 
21
21
from bzrlib import (
22
22
    remote,
23
 
    repository,
24
23
    tests,
 
24
    urlutils,
25
25
    )
26
26
from bzrlib.tests.per_repository import TestCaseWithRepository
27
27
 
43
43
        wt_a = self.make_branch_and_tree('a')
44
44
        branch_a = wt_a.branch
45
45
        branch_b = self.make_branch('b')
46
 
        branch_b.set_stacked_on_url('../a')
 
46
        branch_b.set_stacked_on_url(
 
47
            urlutils.relative_url(branch_b.base, branch_a.base))
47
48
        branch_c = self.make_branch('c')
48
 
        branch_c.set_stacked_on_url('../b')
 
49
        branch_c.set_stacked_on_url(
 
50
            urlutils.relative_url(branch_c.base, branch_b.base))
49
51
        revid_1 = wt_a.commit('first commit')
50
52
        return branch_a, branch_b, branch_c, revid_1
51
53