On Fri, Nov 12, 2010 at 09:04, Leon Meßner <[email protected]> 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 _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to "[email protected]"
