[Python-checkins] r76754 - in python: branches/py3k branches/release24-maint branches/release25-maint branches/release26-maint trunk/Lib/logging/__init__.py trunk/Misc/NEWS

[Mark Dickinson]

On Fri, Dec 11, 2009 at 9:16 AM, vinay.sajip <python-checkins at python.org> wrote:
> Author: vinay.sajip
> Date: Fri Dec 11 10:16:01 2009
> New Revision: 76754
>
> Log:
> Issue #7470: logging: fix bug in Unicode encoding fallback.
>
> Modified:
>   python/branches/py3k/   (props changed)
>   python/branches/release24-maint/   (props changed)
>   python/branches/release25-maint/   (props changed)
>   python/branches/release26-maint/   (props changed)

Vinay, did you intend to alter the svn properties on these branches,
or can these changes be reverted?  These property changes appear
to be causing svnmerge (e.g., from trunk to py3k) to fail.

>   python/trunk/Lib/logging/__init__.py
>   python/trunk/Misc/NEWS