r866018 | dustin | 2007-08-03 16:59:44 +0000 (Fri, 03 Aug 2007) * svnmerge_test.py replace single quotes in self.launch() with double-quotes (Windows compatibility) replace multiline expected_output with a regex (TestCase_launch): use 'attrib' instead of 'dir' (which is not an executable) * svnmerge.py (construct_merged_log_message) normalize line endings in log message Patch by: Luke Call <lsuvkne@onemodel.org> Patch by: Dustin Mitchell <dustin@zmanda.com> Patch by: Michael Willmott <mwillmott@leadgenpro.co.uk> Review by: Hernan Martinez Foffani <hernan.martinez@ecc.es> Review by: Dustin Mitchell <dustin@zmanda.com>
r869889 | rocketraman | 2008-03-09 21:06:52 +0000 (Sun, 09 Mar 2008) 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@gmail.com> Review by: Giovanni Bajo <rasky@develer.com> Found by: Hernán Martínez Foffani <hernan.martinez@ecc.es>