You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2010/09/02 19:18:27 UTC
RE: svn commit: r992050 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
> -----Original Message-----
> From: pburba@apache.org [mailto:pburba@apache.org]
> Sent: donderdag 2 september 2010 20:51
> To: commits@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 ;-)
Re: svn commit: r992050 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Posted by Stefan Sperling <st...@elego.de>.
On Thu, Sep 02, 2010 at 03:33:13PM -0400, Paul Burba wrote:
> On Thu, Sep 2, 2010 at 3:18 PM, Bert Huijben <be...@qqmail.nl> wrote:
> > $ 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 ;-)
>
> And don't forget
>
> >>> os.path.pathsep
> ';'
Clearly a case for the department of redundancy department...
Re: svn commit: r992050 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Posted by Stefan Sperling <st...@elego.de>.
On Thu, Sep 02, 2010 at 03:33:13PM -0400, Paul Burba wrote:
> On Thu, Sep 2, 2010 at 3:18 PM, Bert Huijben <be...@qqmail.nl> wrote:
> > $ 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 ;-)
>
> And don't forget
>
> >>> os.path.pathsep
> ';'
Clearly a case for the department of redundancy department...
Re: svn commit: r992050 -
/subversion/trunk/subversion/tests/cmdline/merge_tests.py
Posted by Stefan Sperling <st...@elego.de>.
On Thu, Sep 02, 2010 at 03:33:13PM -0400, Paul Burba wrote:
> On Thu, Sep 2, 2010 at 3:18 PM, Bert Huijben <be...@qqmail.nl> wrote:
> > $ 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 ;-)
>
> And don't forget
>
> >>> os.path.pathsep
> ';'
Clearly a case for the department of redundancy department...
Re: svn commit: r992050 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Sep 2, 2010 at 3:18 PM, Bert Huijben <be...@qqmail.nl> wrote:
> $ 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 ;-)
And don't forget
>>> os.path.pathsep
';'
Re: svn commit: r992050 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Sep 2, 2010 at 3:18 PM, Bert Huijben <be...@qqmail.nl> wrote:
> $ 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 ;-)
And don't forget
>>> os.path.pathsep
';'