← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_stacking.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-14 01:48:16 UTC
  • mfrom: (6213 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6214.
  • Revision ID: jelmer@samba.org-20111014014816-q61w41x9l6jvzb07
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_stacking.py
150
150
        self.assertRevisionNotInRepository('newbranch', trunk_revid)
151
151
        tree = new_dir.open_branch().create_checkout('local')
152
152
        new_branch_revid = tree.commit('something local')
153
 
        self.assertRevisionNotInRepository('mainline', new_branch_revid)
 
153
        self.assertRevisionNotInRepository(
 
154
            trunk_tree.branch.base, new_branch_revid)
154
155
        self.assertRevisionInRepository('newbranch', new_branch_revid)
155
156
 
156
157
    def test_sprout_stacked_from_smart_server(self):
171
172
        self.assertRevisionNotInRepository('newbranch', trunk_revid)
172
173
        tree = new_dir.open_branch().create_checkout('local')
173
174
        new_branch_revid = tree.commit('something local')
174
 
        self.assertRevisionNotInRepository('mainline', new_branch_revid)
 
175
        self.assertRevisionNotInRepository(trunk_tree.branch.user_url,
 
176
            new_branch_revid)
175
177
        self.assertRevisionInRepository('newbranch', new_branch_revid)
176
178
 
177
179
    def test_unstack_fetches(self):
570
572
        stacked.set_last_revision_info(1, 'rev-base')
571
573
        stacked_relative = self.make_branch('stacked_relative',
572
574
                                            format=self.bzrdir_format)
573
 
        stacked_relative.set_stacked_on_url('../base')
 
575
        stacked_relative.set_stacked_on_url(base_tree.branch.user_url)
574
576
        stacked.set_last_revision_info(1, 'rev-base')
575
577
        self.start_logging_connections()
576
578