> -----Original Message-----
> From: pburba_at_apache.org [mailto:pburba_at_apache.org]
> Sent: donderdag 2 september 2010 20:51
> To: commits_at_subversion.apache.org
> Subject: svn commit: r992050 -
> /subversion/trunk/subversion/tests/cmdline/merge_tests.py
>
> Author: pburba
> Date: Thu Sep 2 18:51:09 2010
> New Revision: 992050
>
> URL: http://svn.apache.org/viewvc?rev=992050&view=rev
> Log:
> Follow-up to r992042, fix spurious failure on non-windows platforms.
>
> * subversion/tests/cmdline/merge_tests.py
>
> (merge_with_os_deleted_subtrees): I don't think that means what you
> think
> it means: os.pathsep is used by the operating system to separate
> search
> path components, os.sep is what we want.
>
>
> Modified:
> subversion/trunk/subversion/tests/cmdline/merge_tests.py
>
> Modified: subversion/trunk/subversion/tests/cmdline/merge_tests.py
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/
> merge_tests.py?rev=992050&r1=992049&r2=992050&view=diff
> =======================================================================
> =======
> --- subversion/trunk/subversion/tests/cmdline/merge_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/merge_tests.py Thu Sep 2
> 18:51:09 2010
> @@ -15873,7 +15873,7 @@ def merge_with_os_deleted_subtrees(sbox)
> if sys.platform == 'win32':
> re_sep = '\\\\'
> else:
> - re_sep = os.pathsep
> + re_sep = os.sep
$ python
ActivePython 2.6.1.1 (ActiveState Software Inc.) based on
Python 2.6.1 (r261:67515, Dec 5 2008, 13:58:38) [MSC v.1500 32 bit (Intel)] on
win32
Type "help", "copyright", "credits" or "license" for more information.
>>> import os;
>>> print os.sep;
\
>>> print os.pathsep;
;
>>> print os.path.sep;
\
Nice ;-)
Received on 2010-09-02 21:20:26 CEST