Re: svn commit: r29815 - trunk/contrib/client-side/svnmerge

["Daniel L. Rall" <dl...@finemaltcoding.com>]

Raman, do you know whether this needs a backport to the 1.5.x branch? If so,
would you nominate it for such?

Thanks, Dan

On Sun, 09 Mar 2008, rocketraman@tigris.org wrote:

> Author: rocketraman
> Date: Sun Mar  9 14:06:52 2008
> New Revision: 29815
> 
> Log:
> Fix regression error in r29666 for non-english locales that was causing a 
> KeyError when svnmerge.py commands were executed, since the output of svn 
> info was non-english and therefore non-parseable.
> 
> * contrib/client-side/svnmerge.py: Set the environment in which the script
>     operates to set LC_MESSAGES = C (to force svn messages, such as those
>     for svn info to be in english, and thus parseable by svnmerge.py), while
>     also removing any pre-existing setting for LC_ALL (since setting LC_ALL 
>     to C causes log output to not be internationalized).
> 
> Patch by:  me
>            Laurent Petit <la...@gmail.com>
> Review by: Giovanni Bajo <ra...@develer.com>
> Found by:  Hernán Martínez Foffani <he...@ecc.es>
> 
> 
> Modified:
>    trunk/contrib/client-side/svnmerge/svnmerge.py
> 
> Modified: trunk/contrib/client-side/svnmerge/svnmerge.py
> URL: http://svn.collab.net/viewvc/svn/trunk/contrib/client-side/svnmerge/svnmerge.py?pathrev=29815&r1=29814&r2=29815