From owner-freebsd-stable@FreeBSD.ORG Thu Mar 12 07:00:40 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E4D591065672 for ; Thu, 12 Mar 2009 07:00:40 +0000 (UTC) (envelope-from antik@bsd.ee) Received: from sorbesgroup.com (mail.sorbesgroup.com [217.159.241.118]) by mx1.freebsd.org (Postfix) with ESMTP id 742298FC0C for ; Thu, 12 Mar 2009 07:00:40 +0000 (UTC) (envelope-from antik@bsd.ee) Received: from localhost (localhost.localdomain [127.0.0.1]) by sorbesgroup.com (Postfix) with ESMTP id 189293C530D1 for ; Thu, 12 Mar 2009 08:06:47 +0200 (EET) Received: from sorbesgroup.com ([127.0.0.1]) by localhost (sorbesgroup.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11722-04 for ; Thu, 12 Mar 2009 08:06:46 +0200 (EET) Received: from [192.168.0.80] (andrei [192.168.0.80]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sorbesgroup.com (Postfix) with ESMTP id CDEFC3C530A6 for ; Thu, 12 Mar 2009 08:06:46 +0200 (EET) Message-ID: <49B8AB66.9080408@bsd.ee> Date: Thu, 12 Mar 2009 08:27:50 +0200 From: Andrei Kolu User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: FreeBSD Stable Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: amavisd-new at localhost Subject: mergemaster annoyance or not? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 07:00:41 -0000 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.