Attachment 220827 Details for Bug 252054 – Ugly hack for mergemaster(8) to workaround Id removal

[patch] Ugly hack for mergemaster(8) to workaround Id removal

svn_to_git_mergemaster_workaround.diff (text/plain), 1.08 KB, created by Marek Zarychta on 2020-12-22 22:04:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Zarychta

Created: 2020-12-22 22:04:22 UTC

Size: 1.08 KB

patch

obsolete

>diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
>index 7703e285611..5dec1a3374f 100755
>--- a/usr.sbin/mergemaster/mergemaster.sh
>+++ b/usr.sbin/mergemaster/mergemaster.sh
>@@ -1128,13 +1128,21 @@ for COMPFILE in `find . -type f | sort`; do
>     #
>     ID1=`grep "[$]${ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null`
>     ID2=`grep "[$]${ID_TAG}:" ${COMPFILE} 2>/dev/null` || ID2=none
>-
>-    case "${ID2}" in
>-    "${ID1}")
>-      echo " *** Temp ${COMPFILE} and installed have the same Id, deleting"
>-      rm "${COMPFILE}"
>-      ;;
>-    esac
>+    # Compare timestamps to workarodund git tag removal
>+    TS1=`stat -f %m ${DESTDIR}${COMPFILE#.} 2>/dev/null`
>+    TS2=`stat -f %m ${COMPFILE} 2>/dev/null`
>+    TSDIFF=`expr ${TS2} - ${TS1}`
>+    if [ ${ID2} = "none" -a ${TSDIFF} -gt 0 ] ; then 
>+	echo " *** ${COMPFILE} in sources is older than installed one, deleting"
>+	rm "${COMPFILE}"
>+    else
>+	case "${ID2}" in
>+	"${ID1}")
>+	  echo " *** Temp ${COMPFILE} and installed have the same Id, deleting"
>+	  rm "${COMPFILE}"
>+	  ;;
>+	esac
>+    fi
>     ;;
>   esac
>

Actions: View | Diff

Attachments on bug 252054: 220823 | 220827 | 220828