diff options
| author | dougb <dougb@FreeBSD.org> | 2002-02-12 09:54:56 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2002-02-12 09:54:56 +0000 |
| commit | 050837293fd14801c43b6cdedb8f4af1561a00de (patch) | |
| tree | 6f14e78c0417539f37c81122217e3ad431e1c44b /usr.sbin | |
| parent | e9ff6763fb5d8b7737c1381a10fcaf6b9e943c0e (diff) | |
| download | FreeBSD-src-050837293fd14801c43b6cdedb8f4af1561a00de.zip FreeBSD-src-050837293fd14801c43b6cdedb8f4af1561a00de.tar.gz | |
* Update (c)
* Fix a problem with files that have no CVS $Id's. Thanks to naddy for
spotting this one. It wasn't a _huge_ problem since almost all the files
we install (except motd) have one, but still, it's a bug.
* Add a divider between diff outputs, which is helpful both for logs,
and for giving a good visual clue for diffs that are smaller than
$LINES. Another helpful suggestion from Gary W. Swearingen, swear@blarg.net.
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 92b327b..10746d8 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -5,7 +5,7 @@ # Compare files created by /usr/src/etc/Makefile (or the directory # the user specifies) with the currently installed copies. -# Copyright 1998-2001 Douglas Barton +# Copyright 1998-2002 Douglas Barton # DougB@FreeBSD.org # $FreeBSD$ @@ -109,6 +109,9 @@ diff_loop () { "${HANDLE_COMPFILE}" = "NOT V" ]; do if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then + echo '' + echo ' ====================================================================== ' + echo '' ( echo '' echo " *** Displaying differences between ${COMPFILE} and installed version:" @@ -731,7 +734,7 @@ for COMPFILE in `find . -type f -size +0`; do # user will have less to wade through if files are left to merge by hand. # CVSID1=`grep "[$]${CVS_ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` - CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` + CVSID2=`grep "[$]${CVS_ID_TAG}:" ${COMPFILE} 2>/dev/null` || CVSID2=none case "${CVSID2}" in "${CVSID1}") |
