← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_annotate.py
233
233
    def test_annotated_edited_merged_file_revnos(self):
234
234
        wt = self._create_merged_file()
235
235
        out, err = self.run_bzr(['annotate', 'file'])
236
 
        email = config.extract_email_address(wt.branch.get_config().username())
 
236
        email = config.extract_email_address(
 
237
            wt.branch.get_config_stack().get('email'))
237
238
        self.assertEqual(
238
239
            '3?    %-7s | local\n'
239
240
            '1     test@ho | foo\n'