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

Re: Windows buildbot FAIL on 1.7.x

From: Philip Martin <philip_at_codematters.co.uk>
Date: Fri, 09 Nov 2012 13:01:48 +0000

Philip Martin <philip.martin_at_wandisco.com> writes:

> Stefan Sperling <stsp_at_elego.de> writes:
>>
>> Can I just commit that to the 1.7.x branch as obvious fix?
>>
>> Index: subversion/tests/cmdline/patch_tests.py
>> ===================================================================
>> --- subversion/tests/cmdline/patch_tests.py (revision 1407431)
>> +++ subversion/tests/cmdline/patch_tests.py (working copy)
>> @@ -3939,7 +3939,7 @@ def patch_target_no_eol_at_eof(sbox):
>> "context", # no newline at end of file
>> ]
>> expected_output = [
>> - 'U %s\n' % os.path.join(wc_dir, 'A/mu'),
>> + 'U %s\n' % os.path.join(wc_dir, 'A', 'mu'),
>> 'U %s\n' % os.path.join(wc_dir, 'iota'),
>> ]
>
> The same code, without the above patch, seems to PASS on trunk. Why does
> the branch need different code? Does the testsuite have some path
> normalisation that corrects/hides the bug?
>
> If that patch is the correct solution I think you should commit to trunk
> and backport.

Ah! trunk uses the sbox.ospath which handles "foo/bar" on Windows, I
didn't spot that when I compared the code. So we could fix it with your
patch above or by switching to sbox.ospath to make the code look like
trunk.

-- 
Philip
Received on 2012-11-09 14:02:26 CET

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