~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

merge dirstate

Show diffs side-by-side

added added

removed removed

Lines of Context:
168
168
        self.assertStatus([
169
169
                'unknown:\n',
170
170
                '  bye.c\n',
171
 
                '  dir2\n',
 
171
                '  dir2/\n',
172
172
                '  directory/hello.c\n'
173
173
                ],
174
174
                wt)
204
204
        tof.seek(0)
205
205
        self.assertEquals(tof.readlines(),
206
206
                          ['unknown:\n',
207
 
                           '  dir2\n'
 
207
                           '  dir2/\n'
208
208
                           ])
209
209
        tof = StringIO()
210
210
        show_tree_status(wt, specific_files=['dir2'], to_file=tof, short=True)