svn commit: r13141 - trunk/contrib/client-side

Author: archiecobbs
Date: Thu Feb 24 09:02:47 2005
New Revision: 13141

Modified:
   trunk/contrib/client-side/svnmerge
Log:
* trunk/contrib/client-side/svnmerge:
  - Unset LANG and LC_ALL to avoid parse failures when we are expecting
    to see English words being output from 'svn'.

Submitted by: Martin Struwe <mastr-yozSB/E1NqPwIETdXhFf/w@xxxxxxxxxxxxxxxx>


Modified: trunk/contrib/client-side/svnmerge
Url: 
http://svn.collab.net/viewcvs/svn/trunk/contrib/client-side/svnmerge?view=diff&rev=13141&p1=trunk/contrib/client-side/svnmerge&r1=13140&p2=trunk/contrib/client-side/svnmerge&r2=13141
==============================================================================
--- trunk/contrib/client-side/svnmerge  (original)
+++ trunk/contrib/client-side/svnmerge  Thu Feb 24 09:02:47 2005
@@ -48,6 +48,10 @@
 SRCREV=`echo '$Rev$' | sed 's/^\$Rev: \([0-9]\{1,\}\).\{0,\}$/\1/g'`
 SRCDATE=`echo '$Date$' | sed 's/^\$Date: .\{0,\}(\(.\{0,\}\)).\{0,\}$/\1/g'`
 
+# We expect English output
+unset LANG
+unset LC_ALL
+
 # Subroutine to output usage message
 usage()
 {