From owner-svn-src-head@FreeBSD.ORG Sat Jun 19 17:36:15 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2653D1065670; Sat, 19 Jun 2010 17:36:15 +0000 (UTC) (envelope-from lstewart@freebsd.org) Received: from lauren.room52.net (lauren.room52.net [210.50.193.198]) by mx1.freebsd.org (Postfix) with ESMTP id D2DF18FC08; Sat, 19 Jun 2010 17:36:14 +0000 (UTC) Received: from lawrence1.loshell.room52.net (unknown [59.167.184.191]) by lauren.room52.net (Postfix) with ESMTPSA id 5120A7E84A; Sun, 20 Jun 2010 03:36:13 +1000 (EST) Message-ID: <4C1D000C.8090807@freebsd.org> Date: Sun, 20 Jun 2010 03:36:12 +1000 From: Lawrence Stewart User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-AU; rv:1.9.1.9) Gecko/20100405 Thunderbird/3.0.4 MIME-Version: 1.0 To: Rui Paulo References: <201006141537.o5EFbnTD093866@svn.freebsd.org> <4C1C3162.60300@freebsd.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: 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... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2010 17:36:15 -0000 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 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