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

Improve on 184781 - instead of ignoring the file when the only difference

Browse Source 
is CVS Id, replace the old one with the new one automatically. While I
don't see much difference, some people think it's somehow better that way.
This commit is contained in:
Maxim Sobolev 2008-11-09 23:44:32 +00:00
parent e829eb6d61
commit 333b8b2fa0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -956,8 +956,14 @@ for COMPFILE in `find . -type f -size +0`; do
sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${COMPFILE}" > "${TMPFILE2}" sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${COMPFILE}" > "${TMPFILE2}"
if diff -q ${DIFF_OPTIONS} "${TMPFILE1}" "${TMPFILE2}" > \ if diff -q ${DIFF_OPTIONS} "${TMPFILE1}" "${TMPFILE2}" > \
/dev/null 2>&1; then /dev/null 2>&1; then
echo " *** Temp ${COMPFILE} and installed are the same except CVS Id, deleting" echo " *** Temp ${COMPFILE} and installed are the same except CVS Id, replacing"
if mm_install "${COMPFILE}"; then
echo " *** ${COMPFILE} upgraded successfully"
echo ''
rm "${COMPFILE}" rm "${COMPFILE}"
else
echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand"
fi
fi fi
rm -f "${TMPFILE1}" "${TMPFILE2}" rm -f "${TMPFILE1}" "${TMPFILE2}"
;; ;;