mergemaster comparing everything.
doug at fledge.watson.org
Sat Nov 13 14:49:52 UTC 2010
On Fri, 12 Nov 2010, Leon Me?ner wrote:
> is there a trick besides using the rcs funktion of mergemaster to get
> around having to look at every file in /etc for comparison?
> I know there once was a bug in mergemaster but it's closed for a long
> time now.
> *** Displaying differences between ./etc/periodic/daily/300.calendar
> and installed version:
> --- /etc/periodic/daily/300.calendar 2010-07-29 12:54:42.000000000
> +++ ./etc/periodic/daily/300.calendar 2010-11-12 17:06:33.000000000
> @@ -1,6 +1,6 @@
> -# $FreeBSD: src/etc/periodic/daily/300.calendar,v 22.214.171.124.4.1
> 2010/06/14 02:09:06 kensmith Exp $
> +# $FreeBSD: src/etc/periodic/daily/300.calendar,v 126.96.36.199 2009/08/03
> 08:13:06 kensmith Exp $
> # `calendar -a' needs to die. Why? Because it's a bad idea, particular
> # with networked home directories, but also in general. If you want
> # the
> 90% of the differences are just in this cvs? tag lines. This is an
> upgrade from 8.1 to -STABLE.
Check out the man page version 8 with FBSD there are many options. I tossed a
script I wrote in favor of the following in /etc/mergemaster.rc:
# Automatically install files that do not exist
# Automatically upgrade files that have not been edited
# Ignore files that I don't want changed
# Do not display changes that only affect whitespace
# Ignore CVS id lines to stop replacing files where only that line has changed
With apologizes to whoever first posted this, I did not save the name.
More information about the freebsd-questions