From owner-freebsd-current@FreeBSD.ORG Mon Aug 10 05:27:22 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5016D1065670; Mon, 10 Aug 2009 05:27:22 +0000 (UTC) (envelope-from mel.flynn+fbsd.current@mailing.thruhere.net) Received: from mailhub.rachie.is-a-geek.net (rachie.is-a-geek.net [66.230.99.27]) by mx1.freebsd.org (Postfix) with ESMTP id 1A73F8FC16; Mon, 10 Aug 2009 05:27:21 +0000 (UTC) Received: from smoochies.rachie.is-a-geek.net (mailhub.rachie.is-a-geek.net [192.168.2.11]) by mailhub.rachie.is-a-geek.net (Postfix) with ESMTP id F17E97E818; Sun, 9 Aug 2009 21:27:20 -0800 (AKDT) From: Mel Flynn To: freebsd-current@freebsd.org Date: Sun, 9 Aug 2009 21:27:19 -0800 User-Agent: KMail/1.11.4 (FreeBSD/8.0-BETA2; KDE/4.2.4; i386; ; ) References: <409F1C03-B18C-4084-93D0-3D1918D7F105@exscape.org> <9e20d71e0908081339l19710247nbe03edd086de7456@mail.gmail.com> <4A7DE4E0.4010205@FreeBSD.org> In-Reply-To: <4A7DE4E0.4010205@FreeBSD.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200908092127.19931.mel.flynn+fbsd.current@mailing.thruhere.net> Cc: Ed Schouten , Dimitry Andric , Doug Barton , Artis Caune , Thomas Backman Subject: Re: What's up with the SVN repository? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2009 05:27:22 -0000 On Saturday 08 August 2009 12:49:36 Doug Barton wrote: > Artis Caune wrote: > > 2009/8/8 Dimitry Andric : > >>> Also, what's the equivalent of find /usr/src -type d -name CVS -exec > >>> echo TRELENG_8 \>{}/Tag \; or do we have to svn diff for local patches, > >>> rm -rf, checkout stable/8 and re-apply diffs? > >> > >> Use svn switch to switch over your checked out copy, e.g. > >> > >> svn switch svn://svn.freebsd.org/base/stable/8 > > > > If you svn switch, keywords are not re-expanded: > > # $FreeBSD: head/Makefile 190628 2009-04-01 17:11:50Z bz $ > > but should be > > # $FreeBSD: stable/8/Makefile 190628 2009-04-01 17:11:50Z bz $ > > > > I think "svn diff, svn co, patch" is the only way how to switch to > > stable/8. > > You guys are making this way too complicated. Well, I took the lazy road, cause I didn't feel like sorting out what directories were not under svn's control (and thus not showing up in svn diff). svn switch worked fine and fixing the keywords was a breeze: find . -name '.svn' -prune -o -type f -print |while read FILE; do if grep -q '\$FreeBSD: head/.*\$' ${FILE}; then sed -e 's,\$FreeBSD: head/,$FreeBSD: stable/8/,' -i '' ${FILE} else echo "No match: ${FILE}" fi done I put in the else so I could see which files didn't have a keyword. That was fun when we went into contrib :) -- Mel