Date: Thu, 12 Mar 2009 08:27:50 +0200 From: Andrei Kolu <antik@bsd.ee> To: FreeBSD Stable <freebsd-stable@freebsd.org> Subject: mergemaster annoyance or not? Message-ID: <49B8AB66.9080408@bsd.ee>
next in thread | raw e-mail | index | archive | help
Hello! As long time FreeBSD user I am concerned about RELEASE and STABLE configuration files inconsistency. No big deal but really annoying if you want to upgrade systems occassionally. The problem is that there is huge amount of old files between RELEASE and STABLE config files- more precisely lots of older config files in STABLE that is really strange considered that it should be much newer than RELEASE. FE: -# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm Exp $ -# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5.2.1.2.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5.2.1 2008/01/28 07:55:44 dougb Exp $ -# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6.6.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/nfsclient,v 1.6 2006/12/31 10:37:18 yar Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.13.10.1.2.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.13.10.1 2008/01/28 07:55:44 dougb Exp $ -# $FreeBSD: src/etc/crontab,v 1.32.32.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/crontab,v 1.32 2002/11/22 16:13:39 tom Exp $ Oh, and why I have to remove myself from the system? I don't get it. Same problem with master.password file- why the hell I have to change that? -# $FreeBSD: src/etc/group,v 1.35.6.1 2008/11/25 02:59:29 kensmith Exp $ +# $FreeBSD: src/etc/group,v 1.35 2007/06/11 18:36:39 ceri Exp $ # -wheel:*:0:root,antik +wheel:*:0:root daemon:*:1: kmem:*:2: sys:*:3: @@ -29,4 +29,3 @@ www:*:80: nogroup:*:65533: nobody:*:65534: -antik:*:1001: How comes that difference is 4 years? Of course files are identical but this is annoying to go through files that is not changed at all. Some files are newer- that's expected BTW. Please syncronize your cvs between releases.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49B8AB66.9080408>