From 48d5b1d6102bf6d4b152adb78c42dbaef67bb4de Mon Sep 17 00:00:00 2001 From: sobomax Date: Sun, 9 Nov 2008 23:44:32 +0000 Subject: Improve on 184781 - instead of ignoring the file when the only difference 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. --- usr.sbin/mergemaster/mergemaster.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'usr.sbin/mergemaster') diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index 18242fb..df1954d 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -956,8 +956,14 @@ for COMPFILE in `find . -type f -size +0`; do sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${COMPFILE}" > "${TMPFILE2}" if diff -q ${DIFF_OPTIONS} "${TMPFILE1}" "${TMPFILE2}" > \ /dev/null 2>&1; then - echo " *** Temp ${COMPFILE} and installed are the same except CVS Id, deleting" - rm "${COMPFILE}" + echo " *** Temp ${COMPFILE} and installed are the same except CVS Id, replacing" + if mm_install "${COMPFILE}"; then + echo " *** ${COMPFILE} upgraded successfully" + echo '' + rm "${COMPFILE}" + else + echo " *** Problem upgrading ${COMPFILE}, it will remain to merge by hand" + fi fi rm -f "${TMPFILE1}" "${TMPFILE2}" ;; -- cgit v1.1