/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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
230
230
        tof.seek(0)
231
231
        self.assertEquals(tof.readlines(), ['?   dir2/\n'])
232
232
 
 
233
        tof = StringIO()
 
234
        revs = [RevisionSpec.from_string('0'), RevisionSpec.from_string('1')]
 
235
        show_tree_status(wt, specific_files=['test.c'], to_file=tof,
 
236
                         short=True, revision=revs)
 
237
        tof.seek(0)
 
238
        self.assertEquals(tof.readlines(), ['+N  test.c\n'])
 
239
 
233
240
    def test_specific_files_conflicts(self):
234
241
        tree = self.make_branch_and_tree('.')
235
242
        self.build_tree(['dir2/'])