d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Update (c)

Browse Source 
* 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.
This commit is contained in:
Doug Barton 2002-02-12 09:54:56 +00:00
parent cf767f1d8e
commit f6694187c2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=90564
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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}")