On Saturday 08 August 2009 12:49:36 Doug Barton wrote:
quoted text
> 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
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"