From owner-freebsd-current@FreeBSD.ORG  Mon Jan 16 07:57:41 2012
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4ED4106566B
	for <freebsd-current@freebsd.org>; Mon, 16 Jan 2012 07:57:41 +0000 (UTC)
	(envelope-from deeptech71@gmail.com)
Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com
	[209.85.216.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 99FA08FC0C
	for <freebsd-current@freebsd.org>; Mon, 16 Jan 2012 07:57:41 +0000 (UTC)
Received: by qcse1 with SMTP id e1so664345qcs.13
	for <freebsd-current@freebsd.org>; Sun, 15 Jan 2012 23:57:41 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=mime-version:date:message-id:subject:from:to:content-type;
	bh=ociteeHuwD9Kx3B34zOis1BhI9aoJRY+kitbZORUQOU=;
	b=X3/nYDiHQ62IzVIWB9ixNc1EXELT8kuL91lFDMKlZBiGLXvk1I7bQ7tFwx4WcMbw7c
	Nxh/oKJVy4p5rW13KBD8vUY+i/chR4FFjGllDG29qwQ63x+dNEUmanblBV6Jifyf//Gq
	m8uSFMLTCTVAqiJL0GjU7VBV3EDAnta/XtPzk=
MIME-Version: 1.0
Received: by 10.229.76.140 with SMTP id c12mr3466765qck.108.1326699108905;
	Sun, 15 Jan 2012 23:31:48 -0800 (PST)
Received: by 10.229.122.136 with HTTP; Sun, 15 Jan 2012 23:31:48 -0800 (PST)
Date: Mon, 16 Jan 2012 08:31:48 +0100
Message-ID: <CAF6hryT9gXG4QrNo-eTzfwUyD_HBFO2QXC7nox8kkgNCfxBAiw@mail.gmail.com>
From: "deeptech71@gmail.com" <deeptech71@gmail.com>
To: freebsd-current@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
Subject: WTF mergemaster VCS Id checking?
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jan 2012 07:57:41 -0000

Every time I run mergemaster, I have to manually confirm all of the
local changes I have done to /etc (ie., state how to merge the
temporary and existing files), even files have not changed in the
upstream since the last mergemaster run (for example,
temproot/etc/master.passwd virtually never changes). This behaviour is
annoying, but I've already gotten used to it, and thought that it's
the preferred one, to force a system administrator to review,
periodically, all changes in /etc.

I was surprized that today, mergemaster did not mention one of my
changes in /etc:
*** Temp ./etc/rc.d/bgfsck and installed have the same CVS Id, deleting

So it now seems that it actually is intended for mergemaster to
mention only files that have changed in the upstream since the last
mergemaster run, but that funtionality fails. Apparently, some
upstream files have the following VCS Id:
# $FreeBSD$
and that anulls version checking. Recently, a lot of files in /etc
(ie., rc.d files) have received full VCS Id strings, but not all.
Someone ought to touch files in the subversion repository?

So in either way you look at it, something is WRONG(TM).

BTW, off-topic:
1. mergemaster outputs "CVS Id", while mergemaster's manpage contains
"VCS Id". One of these is WRONG(TM). Which one?
2. mergemaster outputs "Use 'i' to install merged file". TODO: add a "the".
3. The BUGS section of mergemaster's manpage is redundant.