← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Johan Walles
  • Date: 2009-05-07 05:08:46 UTC
  • mfrom: (4342 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090507050846-nkwvcyauf1eh653q
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
228
228
 
229
229
        self.check_revno(2, '../base')
230
230
 
 
231
    def test_pull_local_updates_local(self):
 
232
        base_tree = self.create_branches()[0]
 
233
        newchild_tree = base_tree.bzrdir.sprout('newchild').open_workingtree()
 
234
        self.build_tree_contents([('newchild/b', 'newchild b contents\n')])
 
235
        newchild_tree.commit(message='newchild')
 
236
        self.check_revno(2, 'newchild')
 
237
 
 
238
        os.chdir('child')
 
239
        # The pull should succeed, and update
 
240
        # the bound parent branch
 
241
        self.run_bzr('pull ../newchild --local')
 
242
        self.check_revno(2)
 
243
 
 
244
        self.check_revno(1, '../base')
 
245
 
231
246
    def test_bind_diverged(self):
232
247
        base_tree, child_tree = self.create_branches()
233
248
        base_branch = base_tree.branch