/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: John Arbash Meinel
  • Date: 2008-09-02 18:37:02 UTC
  • mfrom: (3678 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3680.
  • Revision ID: john@arbash-meinel.com-20080902183702-16cpowcusfvo7rpv
Merge bzr.dev 3678, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
452
452
        self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
453
453
        alt_id = alt.commit('alt')
454
454
        tree.merge_from_branch(alt.branch)
455
 
        output = StringIO()
 
455
        output = self.make_utf8_encoded_stringio()
456
456
        show_tree_status(tree, to_file=output)
457
457
        self.assertContainsRe(output.getvalue(), 'pending merges:')
458
458
        out, err = self.run_bzr('status tree/a')