~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-16 07:54:18 UTC
  • mfrom: (3537.3.5 stacking)
  • Revision ID: pqm@pqm.ubuntu.com-20080716075418-xbachkqt622m73v1
(mbp) post-merge review cleanups for stacking

Show diffs side-by-side

added added

removed removed

Lines of Context:
138
138
        # and a branch from it which is stacked
139
139
        branch_tree = self.make_branch_and_tree('branch',
140
140
            format='development')
141
 
        branch_tree.branch.set_stacked_on(trunk_tree.branch.base)
 
141
        branch_tree.branch.set_stacked_on_url(trunk_tree.branch.base)
142
142
        # with some work on it
143
143
        branch_tree.commit('moar work plz')
144
144
        # branching our local branch gives us a new stacked branch pointing at