diff options
| author | sobomax <sobomax@FreeBSD.org> | 2008-11-09 23:44:32 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2008-11-09 23:44:32 +0000 |
| commit | 48d5b1d6102bf6d4b152adb78c42dbaef67bb4de (patch) | |
| tree | a6a2b44d943212a31ea0544903861e93108a12bc /usr.sbin/mergemaster | |
| parent | fdb59f927ee739bbda9db671e11bf83d5a3143f3 (diff) | |
| download | FreeBSD-src-48d5b1d6102bf6d4b152adb78c42dbaef67bb4de.zip FreeBSD-src-48d5b1d6102bf6d4b152adb78c42dbaef67bb4de.tar.gz | |
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.
Diffstat (limited to 'usr.sbin/mergemaster')
| -rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 10 |
1 files changed, 8 insertions, 2 deletions
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}" ;; |
