← 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: John Arbash Meinel
  • Date: 2009-07-24 18:26:21 UTC
  • mfrom: (4567 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4568.
  • Revision ID: john@arbash-meinel.com-20090724182621-68s2jhoqf3pn72n7
Merge bzr.dev 4567 to resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_stacking.py
184
184
        trunk_revid = trunk_tree.commit('revision on mainline')
185
185
        # and make branch from it which is stacked
186
186
        try:
187
 
            new_dir = trunk_tree.bzrdir.sprout('newbranch', stacked=True)
 
187
            new_dir = trunk_tree.bzrdir.sprout(self.get_url('newbranch'),
 
188
                stacked=True)
188
189
        except unstackable_format_errors, e:
189
190
            raise TestNotApplicable(e)
190
191
        # stacked repository
191
192
        self.assertRevisionNotInRepository('newbranch', trunk_revid)
 
193
        # TODO: we'd like to commit in the stacked repository; that requires
 
194
        # some care (maybe a BranchBuilder) if it's remote and has no
 
195
        # workingtree
 
196
        ##newbranch_revid = new_dir.open_workingtree().commit('revision in '
 
197
            ##'newbranch')
192
198
        # now when we unstack that should implicitly fetch, to make sure that
193
199
        # the branch will still work
194
200
        new_branch = new_dir.open_branch()