https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252054
Kyle Evans <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #1 from Kyle Evans <[email protected]> --- I looked at this for a bit, and this is kind of gross behavior on mergemaster's part and not specific to -F: https://cgit.freebsd.org/src/tree/usr.sbin/mergemaster/mergemaster.sh#n1122 says: case "${STRICT}" in '' | [Nn][Oo]) # Compare $Id's first so if the file hasn't been modified # local changes will be ignored. # If the files have the same $Id, delete the one in temproot so the # user will have less to wade through if files are left to merge by hand. # 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 ;; esac So if the ident tag was expanded and it matched, mergemaster would assume no changes to the file and discard the new version. I suspect this is a WONTFIX situation, unfortunately. -- You are receiving this mail because: You are the assignee for the bug. _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "[email protected]"
