← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_sprout.py

  • Committer: Robert J. Tanner
  • Date: 2009-06-10 03:56:49 UTC
  • mfrom: (4423 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4425.
  • Revision ID: tanner@real-time.com-20090610035649-7rfx4cls4550zc3c
Merge 1.15.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_sprout.py
155
155
        self.assertEqual(target,
156
156
                         tree.basis_tree().get_symlink_target('link-id'))
157
157
 
 
158
    def test_sprout_with_ghost_in_mainline(self):
 
159
        tree = self.make_branch_and_tree('tree1')
 
160
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
 
161
        tree.add('')
 
162
        tree.commit('msg1', rev_id='rev1')
 
163
        tree.commit('msg2', rev_id='rev2')
 
164
        tree.bzrdir.sprout('target', revision_id='rev1')
 
165
 
158
166
    def assertBranchHookBranchIsStacked(self, pre_change_params):
159
167
        # Just calling will either succeed or fail.
160
168
        pre_change_params.branch.get_stacked_on_url()