11c11
< # $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 189763 2009-03-13 08:48:33Z dougb $
---
> # $FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 189992 2009-03-18 21:51:11Z dougb $
18c18
< echo 'Usage: mergemaster [-scrvahipCPU]'
---
> echo 'Usage: mergemaster [-scrvahipFCPU]'
28a29
> echo ' -F Install files that differ only by revision control Id ($FreeBSD: head/usr.sbin/mergemaster/mergemaster.sh 189992 2009-03-18 21:51:11Z dougb $)'
267c268
< while getopts ":ascrvhipCPm:t:du:w:D:A:U" COMMAND_LINE_ARGUMENT ; do
---
> while getopts ":ascrvhipCPm:t:du:w:D:A:FU" COMMAND_LINE_ARGUMENT ; do
271a273,275
> F)
> FREEBSD_ID=yes
> ;;
1023a1028,1040
> # If the user chose the -F option, test for that before proceeding
> #
> if [ -n "$FREEBSD_ID" ]; then
> if diff -q -I'[$]FreeBSD:.*$' "${DESTDIR}${COMPFILE#.}" "${COMPFILE}" > \
> /dev/null 2>&1; then
> if mm_install "${COMPFILE}"; then
> echo "*** Updated revision control Id for ${DESTDIR}${COMPFILE#.}"
> else
> echo "*** Problem installing ${COMPFILE}, it will remain to merge by hand later"
> fi
> continue
> fi
> fi