From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: Re: [PATCH] scmversion: Improve svn interaction.
Date: Thu, 1 Aug 2013 16:48:47 +0100
Message-ID: <51FA835F.6050100@citrix.com>
References: <1375361143-26607-1-git-send-email-andrew.cooper3@citrix.com>
	<1375371857.7382.133.camel@kazak.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1375371857.7382.133.camel@kazak.uk.xensource.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Campbell <Ian.Campbell@citrix.com>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>, Keir Fraser <keir@xen.org>, Marek Marczykowski <marmarek@invisiblethingslab.com>, Jan Beulich <jbeulich@suse.com>, Xen-devel <xen-devel@lists.xen.org>
List-Id: xen-devel@lists.xenproject.org

On 01/08/13 16:44, Ian Campbell wrote:
> On Thu, 2013-08-01 at 13:45 +0100, Andrew Cooper wrote:
>> Prevent running svn if .svn is not found; some versions of svn will
>> unconditionally create it.
> I was kind of hoping "improve" might mean "delete" ;-)
>
> We must have inherited this from the Linux version. I can't imagine any
> reason why you would ever have wanted to import Xen (or Linux for that
> matter) into a svn tree.
>
> Ian.

And guess where we found the svn bug ;-)

I will gladly delete the svn stuff if wanted, but figured this was
slightly neater and more friendly to people.

~Andrew

>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> CC: Marek Marczykowski <marmarek@invisiblethingslab.com>
>> CC: Keir Fraser <keir@xen.org>
>> CC: Jan Beulich <jbeulich@suse.com>
>> CC: Ian Campbell <ian.campbell@citrix.com>
>> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
>> ---
>>  xen/tools/scmversion |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/xen/tools/scmversion b/xen/tools/scmversion
>> index b0c3b95..ccc6334 100755
>> --- a/xen/tools/scmversion
>> +++ b/xen/tools/scmversion
>> @@ -77,7 +77,7 @@ scm_version()
>>  	fi
>>  
>>  	# Check for svn and a svn repo.
>> -	if rev=`LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
>> +	if test -d .svn && rev=`LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last Changed Rev'`; then
>>  		rev=`echo $rev | awk '{print $NF}'`
>>  		printf -- 'svn:%s' "$rev"
>>  
>