Date: Tue, 22 Dec 2020 19:11:20 +0000 From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 252054] mergemaster(8) regression after transitioning from svn to git Message-ID: <bug-252054-227-hxPKD0h7Lp@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-252054-227@https.bugs.freebsd.org/bugzilla/> References: <bug-252054-227@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D252054 Kyle Evans <kevans@freebsd.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |kevans@freebsd.org --- Comment #1 from Kyle Evans <kevans@freebsd.org> --- I looked at this for a bit, and this is kind of gross behavior on mergemast= er'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 han= d. # ID1=3D`grep "[$]${ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null` ID2=3D`grep "[$]${ID_TAG}:" ${COMPFILE} 2>/dev/null` || ID2=3Dnone 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. --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-252054-227-hxPKD0h7Lp>