Author: delphij
Date: Mon Jun 29 18:51:08 2015
New Revision: 284937
URL: https://svnweb.freebsd.org/changeset/base/284937
Log:
MFC r276095 (des)
Use "RCS tag" instead of "$FreeBSD$ tag", since svn will obediently
expand the latter.
Modified:
stable/10/usr.sbin/freebsd-update/freebsd-update.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/freebsd-update/freebsd-update.sh
==============================================================================
--- stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 18:44:15
2015 (r284936)
+++ stable/10/usr.sbin/freebsd-update/freebsd-update.sh Mon Jun 29 18:51:08
2015 (r284937)
@@ -2287,7 +2287,7 @@ upgrade_oldall_to_oldnew () {
}
# Helper for upgrade_merge: Return zero true iff the two files differ only
-# in the contents of their $FreeBSD$ tags.
+# in the contents of their RCS tags.
samef () {
X=`sed -E 's/\\$FreeBSD.*\\$/\$FreeBSD\$/' < $1 | ${SHA256}`
Y=`sed -E 's/\\$FreeBSD.*\\$/\$FreeBSD\$/' < $2 | ${SHA256}`
@@ -2383,7 +2383,7 @@ upgrade_merge () {
# Ask the user to handle any files which didn't merge.
while read F; do
# If the installed file differs from the version in
- # the old release only due to $FreeBSD$ tag expansion
+ # the old release only due to RCS tag expansion
# then just use the version in the new release.
if samef merge/old/${F} merge/${OLDRELNUM}/${F}; then
cp merge/${RELNUM}/${F} merge/new/${F}
@@ -2405,14 +2405,14 @@ manually...
# of merging files.
while read F; do
# Skip files which haven't changed except possibly
- # in their $FreeBSD$ tags.
+ # in their RCS tags.
if [ -f merge/old/${F} ] && [ -f merge/new/${F} ] &&
samef merge/old/${F} merge/new/${F}; then
continue
fi
# Skip files where the installed file differs from
- # the old file only due to $FreeBSD$ tags.
+ # the old file only due to RCS tags.
if [ -f merge/old/${F} ] &&
[ -f merge/${OLDRELNUM}/${F} ] &&
samef merge/old/${F} merge/${OLDRELNUM}/${F}; then
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
