← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2007-06-28 23:18:09 UTC
  • mfrom: (2562 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2566.
  • Revision ID: john@arbash-meinel.com-20070628231809-pqbt7puoqj8bl07b
[merge] bzr.dev 2562

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
167
167
        br_b = branch.clone(repo_b.bzrdir, revision_id='1')
168
168
        self.assertEqual('1', br_b.last_revision())
169
169
 
170
 
    def test_sprout_partial(self):
171
 
        # test sprouting with a prefix of the revision-history.
172
 
        # also needs not-on-revision-history behaviour defined.
173
 
        wt_a = self.make_branch_and_tree('a')
174
 
        self.build_tree(['a/one'])
175
 
        wt_a.add(['one'])
176
 
        wt_a.commit('commit one', rev_id='1')
177
 
        self.build_tree(['a/two'])
178
 
        wt_a.add(['two'])
179
 
        wt_a.commit('commit two', rev_id='2')
180
 
        repo_b = self.make_repository('b')
181
 
        repo_a = wt_a.branch.repository
182
 
        repo_a.copy_content_into(repo_b)
183
 
        br_b = wt_a.branch.sprout(repo_b.bzrdir, revision_id='1')
184
 
        self.assertEqual('1', br_b.last_revision())
185
 
 
186
170
    def get_parented_branch(self):
187
171
        wt_a = self.make_branch_and_tree('a')
188
172
        self.build_tree(['a/one'])
214
198
        branch_d = branch_b.clone(repo_d.bzrdir)
215
199
        self.assertEqual(random_parent, branch_d.get_parent())
216
200
 
217
 
    def test_sprout_branch_nickname(self):
218
 
        # test the nick name is reset always
219
 
        raise TestSkipped('XXX branch sprouting is not yet tested..')
220
 
 
221
 
    def test_sprout_branch_parent(self):
222
 
        source = self.make_branch('source')
223
 
        target = source.bzrdir.sprout(self.get_url('target')).open_branch()
224
 
        self.assertEqual(source.bzrdir.root_transport.base, target.get_parent())
225
 
 
226
201
    def test_submit_branch(self):
227
202
        """Submit location can be queried and set"""
228
203
        branch = self.make_branch('branch')