~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
747
747
        tree = self.create_tree_with_single_merge()
748
748
        # f3 should be marked as modified by revisions A, B, C, and D
749
749
        self.assertAllRevisionsForFileID(tree, 'f2-id', ['D', 'C', 'A'])
 
750
 
 
751
 
 
752
class TestShowChangedRevisions(TestCaseWithTransport):
 
753
 
 
754
    def test_show_changed_revisions_verbose(self):
 
755
        tree = self.make_branch_and_tree('tree_a')
 
756
        self.build_tree(['tree_a/foo'])
 
757
        tree.add('foo')
 
758
        tree.commit('bar', rev_id='bar-id')
 
759
        s = StringIO()
 
760
        log.show_changed_revisions(tree.branch, [], ['bar-id'], s)
 
761
        self.assertContainsRe(s.getvalue(), 'bar')
 
762
        self.assertNotContainsRe(s.getvalue(), 'foo')