/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_status.py

  • Committer: Martin Pool
  • Date: 2008-05-06 09:14:32 UTC
  • mfrom: (3407 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3408.
  • Revision ID: mbp@sourcefrog.net-20080506091432-g34exmtpsgzvctuu
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
95
95
                '  bye.c\n',
96
96
                '  hello.c\n',
97
97
                'pending merges:\n',
98
 
                '  pending@pending-0-0\n',
 
98
                '  (ghost) pending@pending-0-0\n',
99
99
            ],
100
100
            wt)
101
101
        self.assertStatus([
102
102
                '?   bye.c\n',
103
103
                '?   hello.c\n',
104
 
                'P   pending@pending-0-0\n',
 
104
                'P   (ghost) pending@pending-0-0\n',
105
105
            ],
106
106
            wt, short=True)
107
107
        self.assertStatus([