[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Daniel L. Rall <dlr_at_finemaltcoding.com>
Date: Mon, 10 Mar 2008 10:14:57 -0800

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_at_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 <laurent.petit_at_gmail.com>
> Review by: Giovanni Bajo <rasky_at_develer.com>
> Found by: Hernán Martínez Foffani <hernan.martinez_at_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

  • application/pgp-signature attachment: stored
Received on 2008-03-10 19:13:47 CET

This is an archived mail posted to the Subversion Dev mailing list.