diff options
author | delphij <delphij@FreeBSD.org> | 2015-06-29 18:51:08 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2015-06-29 18:51:08 +0000 |
commit | 87c40e2eadae3fd30548203a27d617dbc8b32a35 (patch) | |
tree | 10a40bc0528254810b445b6a18aadb02467e9fb8 /usr.sbin | |
parent | affd7b417626ccb8d0ffe4f888fd323d856e594c (diff) | |
download | FreeBSD-src-87c40e2eadae3fd30548203a27d617dbc8b32a35.zip FreeBSD-src-87c40e2eadae3fd30548203a27d617dbc8b32a35.tar.gz |
MFC r276095 (des)
Use "RCS tag" instead of "$FreeBSD$ tag", since svn will obediently
expand the latter.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 47588a1..382ea60 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -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 |