← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade_stacked.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/test_upgrade_stacked.py
32
32
 
33
33
    def test_stack_upgrade(self):
34
34
        """Correct checks when stacked-on repository is upgraded.
35
 
        
36
 
        We initially stack on a repo with the same rich root support, 
37
 
        we then upgrade it and should fail, we then upgrade the overlaid 
 
35
 
 
36
        We initially stack on a repo with the same rich root support,
 
37
        we then upgrade it and should fail, we then upgrade the overlaid
38
38
        repository.
39
39
        """
40
40
        base = self.make_branch_and_tree('base',