← 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: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
33
33
 
34
34
 
35
35
class TestLegacyFormats(TestCaseWithTransport):
36
 
    
 
36
 
37
37
    def setUp(self):
38
38
        super(TestLegacyFormats, self).setUp()
39
39
        self.build_tree(['master/', 'child/'])
41
41
        self.make_branch_and_tree('child',
42
42
                        format=bzrdir.format_registry.make_bzrdir('weave'))
43
43
        os.chdir('child')
44
 
    
 
44
 
45
45
    def test_bind_format_6_bzrdir(self):
46
46
        # bind on a format 6 bzrdir should error
47
47
        out,err = self.run_bzr('bind ../master', retcode=3)
51
51
        cwd = urlutils.local_path_to_url(getcwd())
52
52
        self.assertEqual('bzr: ERROR: To use this feature you must '
53
53
                         'upgrade your branch at %s/.\n' % cwd, err)
54
 
    
 
54
 
55
55
    def test_unbind_format_6_bzrdir(self):
56
56
        # bind on a format 6 bzrdir should error
57
57
        out,err = self.run_bzr('unbind', retcode=3)
284
284
        self.check_revno(1)
285
285
 
286
286
    def test_bind_child_ahead(self):
287
 
        # test binding when the master branches history is a prefix of the 
 
287
        # test binding when the master branches history is a prefix of the
288
288
        # childs - it should bind ok but the revision histories should not
289
289
        # be altered
290
290
        child_tree = self.create_branches()[1]