freebsd-skq/crypto/openssh/freebsd-pre-merge.sh

#!/bin/sh
#
# $FreeBSD$
#

:>keywords
:>rcsid
svn list -R | grep -v '/$' | \
while read f ; do
	svn proplist -v $f | grep -q 'FreeBSD=%H' || continue
	egrep -l '^(#|\.\\"|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords
	egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid
done
sort -u keywords rcsid | xargs perl -n -i -e '
	$strip = $ARGV if /\$(Id|OpenBSD):.*\$/;
	print unless (($strip eq $ARGV || /__RCSID/) && /\$FreeBSD[:\$]/);
'
Add a pre-merge script which reverts mechanical changes such as added $FreeBSD$ tags and man page dates. Add a post-merge script which reapplies these changes. Run both scripts to normalize the existing code base. As a result, many files which should have had $FreeBSD$ tags but didn't now have them. Partly rewrite the upgrade instructions and remove the now outdated list of tricks. 2014-03-24 19:15:13 +00:00			`#!/bin/sh`
			`#`
			`# $FreeBSD$`
			`#`

Update the pre- and post-merge scripts to work correctly after the recent cleanup. A round-trip (./freebsd-pre-merge.sh ; ./freebsd-post-merge.sh) now results in an unchanged working copy. 2016-01-19 12:38:53 +00:00			`:>keywords`
			`:>rcsid`
Use 'svn list -R' instead of find, and recognize comments in shell scripts and {ssh,sshd}_config. 2016-01-19 14:25:22 +00:00			`svn list -R \| grep -v '/$' \| \`
Add a pre-merge script which reverts mechanical changes such as added $FreeBSD$ tags and man page dates. Add a post-merge script which reapplies these changes. Run both scripts to normalize the existing code base. As a result, many files which should have had $FreeBSD$ tags but didn't now have them. Partly rewrite the upgrade instructions and remove the now outdated list of tricks. 2014-03-24 19:15:13 +00:00			`while read f ; do`
Update the pre- and post-merge scripts to work correctly after the recent cleanup. A round-trip (./freebsd-pre-merge.sh ; ./freebsd-post-merge.sh) now results in an unchanged working copy. 2016-01-19 12:38:53 +00:00			`svn proplist -v $f \| grep -q 'FreeBSD=%H' \|\| continue`
Use 'svn list -R' instead of find, and recognize comments in shell scripts and {ssh,sshd}_config. 2016-01-19 14:25:22 +00:00			`egrep -l '^(#\|\.\\"\|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords`
Update the pre- and post-merge scripts to work correctly after the recent cleanup. A round-trip (./freebsd-pre-merge.sh ; ./freebsd-post-merge.sh) now results in an unchanged working copy. 2016-01-19 12:38:53 +00:00			`egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid`
			`done`
			`sort -u keywords rcsid \| xargs perl -n -i -e '`
Add a pre-merge script which reverts mechanical changes such as added $FreeBSD$ tags and man page dates. Add a post-merge script which reapplies these changes. Run both scripts to normalize the existing code base. As a result, many files which should have had $FreeBSD$ tags but didn't now have them. Partly rewrite the upgrade instructions and remove the now outdated list of tricks. 2014-03-24 19:15:13 +00:00			`$strip = $ARGV if /\$(Id\|OpenBSD):.*\$/;`
Update the pre- and post-merge scripts to work correctly after the recent cleanup. A round-trip (./freebsd-pre-merge.sh ; ./freebsd-post-merge.sh) now results in an unchanged working copy. 2016-01-19 12:38:53 +00:00			`print unless (($strip eq $ARGV \|\| /__RCSID/) && /\$FreeBSD[:\$]/);`
			`'`