/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2008-08-29 05:18:56 UTC
  • mto: (3606.11.2 bug_261339)
  • mto: This revision was merged to the branch mainline in revision 3667.
  • Revision ID: john@arbash-meinel.com-20080829051856-cybdbv604adwbzn1
Switch out --1.6-rich-root for --1.6.1-rich-root.

Fix up the tests that were expecting the old name.
Also add tests that stacking properly check the various
permutations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
247
247
        branch5 = tree5.branch
248
248
        out, err = self.run_bzr('info -v lightcheckout')
249
249
        self.assertEqualDiff(
250
 
"""Lightweight checkout (format: 1.6 or 1.6-rich-root \
 
250
"""Lightweight checkout (format: 1.6 or 1.6.1-rich-root \
251
251
or dirstate or dirstate-tags or \
252
252
pack-0.92 or rich-root or rich-root-pack)
253
253
Location:
415
415
        # Out of date lightweight checkout
416
416
        out, err = self.run_bzr('info lightcheckout --verbose')
417
417
        self.assertEqualDiff(
418
 
"""Lightweight checkout (format: 1.6 or 1.6-rich-root or \
 
418
"""Lightweight checkout (format: 1.6 or 1.6.1-rich-root or \
419
419
dirstate or dirstate-tags or \
420
420
pack-0.92 or rich-root or rich-root-pack)
421
421
Location:
552
552
        datestring_first = format_date(rev.timestamp, rev.timezone)
553
553
        out, err = self.run_bzr('info tree/lightcheckout --verbose')
554
554
        self.assertEqualDiff(
555
 
"""Lightweight checkout (format: 1.6 or 1.6-rich-root or \
 
555
"""Lightweight checkout (format: 1.6 or 1.6.1-rich-root or \
556
556
dirstate or dirstate-tags or \
557
557
pack-0.92 or rich-root or rich-root-pack)
558
558
Location:
676
676
        datestring_last = format_date(rev.timestamp, rev.timezone)
677
677
        out, err = self.run_bzr('info tree/lightcheckout --verbose')
678
678
        self.assertEqualDiff(
679
 
"""Lightweight checkout (format: 1.6 or 1.6-rich-root or \
 
679
"""Lightweight checkout (format: 1.6 or 1.6.1-rich-root or \
680
680
dirstate or dirstate-tags or \
681
681
pack-0.92 or rich-root or rich-root-pack)
682
682
Location:
1092
1092
            (False, True): 'Lightweight checkout',
1093
1093
            (False, False): 'Checkout',
1094
1094
            }[(shared_repo is not None, light_checkout)]
1095
 
        format = {True: '1.6 or 1.6-rich-root'
 
1095
        format = {True: '1.6 or 1.6.1-rich-root'
1096
1096
                        ' or dirstate or dirstate-tags or pack-0.92'
1097
1097
                        ' or rich-root or rich-root-pack',
1098
1098
                  False: 'dirstate'}[light_checkout]