Hi,

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.

Example:

  *** Displaying differences between ./etc/periodic/daily/300.calendar
and installed version:

--- /etc/periodic/daily/300.calendar    2010-07-29 12:54:42.000000000
+0200
+++ ./etc/periodic/daily/300.calendar   2010-11-12 17:06:33.000000000
+0100
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/periodic/daily/300.calendar,v 1.5.36.1.4.1
2010/06/14 02:09:06 kensmith Exp $
+# $FreeBSD: src/etc/periodic/daily/300.calendar,v 1.5.36.1 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.

Greetings,
Leon
_______________________________________________
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to "freebsd-questions-unsubscr...@freebsd.org"

Reply via email to