← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_info.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_info.py
535
535
        # Create lightweight checkout
536
536
        transport.mkdir('tree')
537
537
        transport.mkdir('tree/lightcheckout')
538
 
        tree2 = branch1.create_checkout('tree/lightcheckout', 
 
538
        tree2 = branch1.create_checkout('tree/lightcheckout',
539
539
            lightweight=True)
540
540
        branch2 = tree2.branch
541
541
        self.assertCheckoutStatusOutput('-v tree/lightcheckout', tree2,
978
978
       ),
979
979
       out)
980
980
        self.assertEqual('', err)
981
 
    
 
981
 
982
982
    def test_info_shared_repository_with_tree_in_root(self):
983
983
        format = bzrdir.format_registry.make_bzrdir('knit')
984
984
        transport = self.get_transport()
1057
1057
        allow us, the test writers, to document what *should* be present in
1058
1058
        the output. Removing this separation would remove the value of the
1059
1059
        tests.
1060
 
        
 
1060
 
1061
1061
        :param path: the path to the light checkout.
1062
1062
        :param lco_tree: the tree object for the light checkout.
1063
1063
        :param shared_repo: A shared repository is in use, expect that in
1143
1143
        else:
1144
1144
            branch_data = ("   checkout of branch: %s\n" %
1145
1145
                lco_tree.branch.bzrdir.root_transport.base)
1146
 
        
 
1146
 
1147
1147
        if verbose:
1148
1148
            verbose_info = '         0 committers\n'
1149
1149
        else:
1150
1150
            verbose_info = ''
1151
 
            
 
1151
 
1152
1152
        self.assertEqualDiff(
1153
1153
"""%s (format: %s)
1154
1154
Location: