mergemaster comparing everything.
l.messner at physik.tu-berlin.de
Fri Nov 12 16:20:07 UTC 2010
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
*** 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 126.96.36.199.4.1
2010/06/14 02:09:06 kensmith Exp $
+# $FreeBSD: src/etc/periodic/daily/300.calendar,v 188.8.131.52 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
90% of the differences are just in this cvs? tag lines. This is an
upgrade from 8.1 to -STABLE.
More information about the freebsd-questions