← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_annotate.py

  • Committer: Jelmer Vernooij
  • Date: 2012-07-02 18:21:51 UTC
  • mfrom: (6531 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6535.
  • Revision ID: jelmer@samba.org-20120702182151-zk9utamutjtjhipq
merge lp:bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_annotate.py
302
302
                                  '1.1.1 barry@f | third\n',
303
303
                                  builder.get_branch(), 'a-id', 'rev-3')
304
304
 
305
 
    def test_annotate_file(self):
306
 
        builder = self.create_merged_trees()
307
 
 
308
 
        to_file = StringIO()
309
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
310
 
            annotate.annotate_file, builder.get_branch(),
311
 
                'rev-3', 'a-id', to_file=to_file)
312
 
 
313
 
        self.assertAnnotateEqualDiff('1     joe@foo | first\n'
314
 
                                     '2     joe@foo | second\n'
315
 
                                     '1.1.1 barry@f | third\n',
316
 
                                     to_file.getvalue())
317
 
 
318
305
    def test_annotate_limits_dotted_revnos(self):
319
306
        """Annotate should limit dotted revnos to a depth of 12"""
320
307
        builder = self.create_deeply_merged_trees()