Date: Sun, 9 Aug 2009 21:27:19 -0800 From: Mel Flynn <mel.flynn+fbsd.current@mailing.thruhere.net> To: freebsd-current@freebsd.org Cc: Ed Schouten <ed@80386.nl>, Dimitry Andric <dimitry@andric.com>, Doug Barton <dougb@freebsd.org>, Artis Caune <artis.caune@gmail.com>, Thomas Backman <serenity@exscape.org> Subject: Re: What's up with the SVN repository? Message-ID: <200908092127.19931.mel.flynn%2Bfbsd.current@mailing.thruhere.net> In-Reply-To: <4A7DE4E0.4010205@FreeBSD.org> References: <409F1C03-B18C-4084-93D0-3D1918D7F105@exscape.org> <9e20d71e0908081339l19710247nbe03edd086de7456@mail.gmail.com> <4A7DE4E0.4010205@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Saturday 08 August 2009 12:49:36 Doug Barton wrote:
> Artis Caune wrote:
> > 2009/8/8 Dimitry Andric <dimitry@andric.com>:
> >>> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908092127.19931.mel.flynn%2Bfbsd.current>