Re: mergemaster comparing everything.
On Fri, 12 Nov 2010, Leon Me?ner wrote: 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.calendar2010-07-29 12:54:42.0 +0200 +++ ./etc/periodic/daily/300.calendar 2010-11-12 17:06:33.0 +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 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 AUTO_INSTALL='yes' # Automatically upgrade files that have not been edited AUTO_UPGRADE='yes' # Ignore files that I don't want changed #IGNORE_FILES='/etc/motd' # Do not display changes that only affect whitespace #DIFF_FLAG='.Bub' # Ignore CVS id lines to stop replacing files where only that line has changed DIFF_OPTIONS='-I$FreeBSD:.*[$]' With apologizes to whoever first posted this, I did not save the name. ___ 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
mergemaster comparing everything.
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.calendar2010-07-29 12:54:42.0 +0200 +++ ./etc/periodic/daily/300.calendar 2010-11-12 17:06:33.0 +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
Re: mergemaster comparing everything.
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. ... 90% of the differences are just in this cvs? tag lines. This is an upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps. ___ 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
Re: mergemaster comparing everything.
On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote: 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. ... 90% of the differences are just in this cvs? tag lines. This is an upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps. thanks, that helped. Did the default behavior of mergemaster change somewhere because i didn't have to do this awhile ago (months not years). 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
Re: mergemaster comparing everything.
On Fri, 12 Nov 2010, Leon Me?ner wrote: On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote: 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. ... 90% of the differences are just in this cvs? tag lines. This is an upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps. thanks, that helped. Did the default behavior of mergemaster change somewhere because i didn't have to do this awhile ago (months not years). Not AFAIK, but I've been using -Ui for quite a while, so maybe I just missed it. ___ 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
Re: mergemaster comparing everything.
On Fri, Nov 12, 2010 at 09:04, Leon Meßner l.mess...@physik.tu-berlin.de wrote: On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote: 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. ... 90% of the differences are just in this cvs? tag lines. This is an upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps. thanks, that helped. Did the default behavior of mergemaster change somewhere because i didn't have to do this awhile ago (months not years). The problem is the svn to cvs exporter doesn't properly tag the existing revisions for releases, but rather checks in a brand new revision and tags that. So, when you switch branches (such as release to stable) with CVS, all the $FreeBSD$ tags change, and you get the false positives in mergemaster. Using your example (etc/periodic/daily/300.calendar), there is: 1.5.36.1.4.1 for RELENG_8_1 1.5.36.1 for RELENG_8 1.5 for MAIN (current) There are many more 1.5.x revisions for other branches. These shouldn't exist - the file hasn't changed since 2000 and 1.5 should just be tagged with for all releases since then. -- Rob Farmer ___ 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
