svn commit: r209158 - in head/contrib/wpa: hostapd hostapd/doc src/common src/crypto src/drivers src/eap_common src/eap_peer src/eap_server src/eapol_supp src/hlr_auc_gw src/l2_packet src/radius sr...

[Lawrence Stewart]

On 06/19/10 19:56, Rui Paulo wrote:
>
> On 19 Jun 2010, at 03:54, Lawrence Stewart wrote:
>
>> Hi Rui,
>>
>> On 06/15/10 01:37, Rui Paulo wrote:
>>> Author: rpaulo
>>> Date: Mon Jun 14 15:37:48 2010
>>> New Revision: 209158
>>> URL: http://svn.freebsd.org/changeset/base/209158
>>>
>>> Log:
>>>    MFV hostapd&   wpa_supplicant 0.6.10.
>>>
>>> Added:
>>
>> [snip]
>>
>>>    head/contrib/wpa/hostapd/radiotap.h
>>>       - copied unchanged from r209140, vendor/wpa/dist/hostapd/radiotap.h
>>
>> [snip]
>>
>>>    head/contrib/wpa/src/drivers/radiotap.h
>>>       - copied unchanged from r209140, vendor/wpa/dist/src/drivers/radiotap.h
>>
>> There seems to be a minor issue with at least the above two files. Something went wrong with the keyword expansion and these two files have been committed with $FreeBSD$ expanded. Perhaps you didn't use the subversion-freebsd client to do some of the work? I believe the following diff should fix the issue I'm seeing.
>>
>> http://people.freebsd.org/~lstewart/patches/misc/wpa_keyword.diff
>
> What is the problem, exactly?

Looking into this a bit more, I believe the problem is that you don't 
have your svn client autoprops set up correctly, and the files you 
committed don't have the "svn:keywords FreeBSD=%H" property set on them, 
so you committed the files with the expanded keyword instead of 
committing the keyword itself. The reason it's these 2 files is that 
they're the only ones with $FreeBSD:...$ in them, the others don't have 
the keyword. I'm not sure how the expanded keyword got into those two 
though...

Take a look at:

http://people.freebsd.org/~lstewart/misc/bsdcan2010/config

in order to get a decent autoprops config going in your 
~/.subversion/config file.

You'll also want to manually go through and add the appropriate props to 
the files you committed. There is a python script distributed with svn 
that will retrospectively apply autoprops for you.

cd /usr/ports/devel/subversion-freebsd/ ; make patch

cp work/subversion-1.6.11/contrib/client-side/svn_apply_autoprops.py 
<somewhere/useful>

You can then use that script to apply the props to the files - it'll 
save you time and pain.

This showed up as a problem in my private Hg repo because when I diff 
head against my dev branch, I'm seeing the $FreeBSD: ...$ line showing 
up as a diff when it shouldn't be there if the keywords were correct in 
the svn repo.

Cheers,
Lawrence