git, $FreeBSD$ and mergemaster

[David Wolfskill]

On Fri, Dec 25, 2020 at 10:00:57PM +1300, Jonathan Chen wrote:
> Hi Kyle,
> 
> On Thu, 24 Dec 2020 at 15:05, Kyle Evans <kevans at freebsd.org> wrote:
> ...
> > mergemaster only uses it as an optimization, if they're unexpanded
> > throughout then it falls back to diff(1) -- i.e. it's slower without.
> 
> Thanks for the answer.
> 
> However, wouldn't this mean that every run of "mergemaster" would
> prompt for local changes? The nice thing about using the $FreeBSD$
> tags was that if I approved a local-change, subsequent runs of
> mergemaster would not prompt me about the local-change unless the
> etc-file had been modified in the source tree.
> 
> Cheers.
> -- 
> Jonathan Chen <jonc at chen.org.nz>
> ....

Indeed: the above-described behavior is what I have observed so far
since the transition (tracking head & stable/12 daily on two machines).

I would go a bit further than stating that the prior behavior was
"nice."

Peace,
david
-- 
David H. Wolfskill                              david at catwhisker.org
"Dismissing reality doesn't make it go away."
 - Rajiv Shah, Rockefeller Foundation president

See https://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20201225/98196114/attachment.sig>