Re: etcupdate -- is there a way to get it to delete $FreeBSD$ strings from my files?

"Dan Mahoney (Ports)" <freebsd@gushi.org> writes:

> Hey there folks,
>
> I grok that etcupdate is supposed to help me gently merge changes in
> from a new source tree into my existing tree in /etc. but as of now,
> most files in /etc don't have the $FreeBSD$ ident strings in them
> anymore (because we've moved to Git, which doesn't use this (although
> I miss it and wish it did))
>
> Anyway, most of my stock /etc files still have this string in them, because it started life as a much older system that's been upgraded for a long time.
>
> An "etcupdate diff" still shows these strings, and yes, I can pass -F
> to ignore those version strings, but at what point will etcupdate be
> modified to no longer use these strings at all?
>
> Is there a good global way to just tell etcupdate to rip these no-longer-relevant strings out, instead of nicely merging around them?
>
> Alternately, is there a way to just tell etcupdate "blow away changes in most files, I am prepared to have puppet re-apply all my local changes"

Revert Mode? Extract mode? They all have some minor inconveniences, but
if you don't have anything you want to keep from the installed versions,
you wouldn't really care...