~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_testament.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
129
129
            timestamp=1129025493,
130
130
            timezone=36000,
131
131
            rev_id='test@user-3',
132
 
            committer='Erik B\xe5gfors <test@user>',
 
132
            committer=u'Erik B\xe5gfors <test@user>',
133
133
            revprops={'uni':u'\xb5'}
134
134
            )
135
135
        t = self.from_revision(self.b.repository, 'test@user-3')