← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-02-03 07:59:47 UTC
  • mfrom: (5641.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20110203075947-l52516mt7wsqryi7
(vila) Merge 2.3 into trunk including fix for lp:707075. (Max Bowsher)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
562
562
        self.assertStatus([
563
563
                'added:\n',
564
564
                '  bye.c\n',
565
 
                '1 shelves exist. See "bzr shelve --list" for details.\n',
 
565
                '1 shelf exists. See "bzr shelve --list" for details.\n',
 
566
            ],
 
567
            wt)
 
568
        self.run_bzr(['shelve', '--all', '-m', 'bar'])
 
569
        self.build_tree(['spam.c'])
 
570
        wt.add('spam.c')
 
571
        self.assertStatus([
 
572
                'added:\n',
 
573
                '  spam.c\n',
 
574
                '2 shelves exist. See "bzr shelve --list" for details.\n',
566
575
            ],
567
576
            wt)
568
577