← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
194
194
 
195
195
        self.build_tree(['checkout1/'])
196
196
        checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
197
 
        branch.BranchReferenceFormat().initialize(checkout_dir,
198
 
            target_branch=master.branch)
 
197
        checkout_dir.set_branch_reference(master.branch)
199
198
        checkout1 = checkout_dir.create_workingtree('m1')
200
199
 
201
200
        # Create a second branch, with an extra commit
251
250
 
252
251
        self.build_tree(['checkout1/'])
253
252
        checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
254
 
        branch.BranchReferenceFormat().initialize(checkout_dir,
255
 
            target_branch=master.branch)
 
253
        checkout_dir.set_branch_reference(master.branch)
256
254
        checkout1 = checkout_dir.create_workingtree('m1')
257
255
 
258
256
        # Create a second branch, with an extra commit
454
452
>>>>>>> MERGE-SOURCE
455
453
''',
456
454
                             'lightweight/file')
 
455
 
 
456
 
 
457
    def test_no_upgrade_single_file(self):
 
458
        """There's one basis revision per tree.
 
459
 
 
460
        Since you can't actually change the basis for a single file at the
 
461
        moment, we don't let you think you can.
 
462
 
 
463
        See bug 557886.
 
464
        """
 
465
        self.make_branch_and_tree('.')
 
466
        self.build_tree_contents([('a/',),
 
467
            ('a/file', 'content')])
 
468
        sr = ScriptRunner()
 
469
        sr.run_script(self, '''
 
470
            $ bzr update ./a
 
471
            2>bzr: ERROR: bzr update can only update a whole tree, not a file or subdirectory
 
472
            $ bzr update ./a/file
 
473
            2>bzr: ERROR: bzr update can only update a whole tree, not a file or subdirectory
 
474
            $ bzr update .
 
475
            2>Tree is up to date at revision 0 of branch ...
 
476
            $ cd a
 
477
            $ bzr update .
 
478
            2>bzr: ERROR: bzr update can only update a whole tree, not a file or subdirectory
 
479
            # however, you can update the whole tree from a subdirectory
 
480
            $ bzr update
 
481
            2>Tree is up to date at revision 0 of branch ...
 
482
            ''')