From owner-freebsd-current@FreeBSD.ORG Tue Jan 17 02:25:57 2012 Return-Path: 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 81B331065672 for ; Tue, 17 Jan 2012 02:25:57 +0000 (UTC) (envelope-from kaduk@mit.edu) Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU [18.9.25.15]) by mx1.freebsd.org (Postfix) with ESMTP id 1E32F8FC14 for ; Tue, 17 Jan 2012 02:25:56 +0000 (UTC) X-AuditID: 1209190f-b7f8a6d000000914-92-4f14dc332a20 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP id D0.23.02324.33CD41F4; Mon, 16 Jan 2012 21:25:55 -0500 (EST) Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q0H2PtGp024161; Mon, 16 Jan 2012 21:25:55 -0500 Received: from multics.mit.edu (MULTICS.MIT.EDU [18.187.1.73]) (authenticated bits=56) (User authenticated as kaduk@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0H2PsWT005403 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 16 Jan 2012 21:25:55 -0500 (EST) Received: (from kaduk@localhost) by multics.mit.edu (8.12.9.20060308) id q0H2PrhA012587; Mon, 16 Jan 2012 21:25:53 -0500 (EST) Date: Mon, 16 Jan 2012 21:25:53 -0500 (EST) From: Benjamin Kaduk To: "deeptech71@gmail.com" In-Reply-To: Message-ID: References: User-Agent: Alpine 1.10 (GSO 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsUixCmqrWt8R8TfYMYdS4vTk/6yWsx584HJ gcljxqf5LB47Z91lD2CK4rJJSc3JLEst0rdL4MpY19DCUvBNqOLW20tMDYzd/F2MnBwSAiYS d5+vYIWwxSQu3FvP1sXIxSEksI9R4trbDnYIZwOjxKVPV6AyB5gkdq/uYQZpERJoYJSYM0sD xGYR0Ja4c/0DE4jNJqAiMfPNRjYQW0TAUOL1hEOMIDazgLzE/yuXwWqEBXQlzv1dBrSag4NT IFBiQWcpiMkrYC+x668LxPQAibZTM9lBbFEBHYnV+6ewgNi8AoISJ2c+YYGYaClx7s91tgmM grOQpGYhSS1gZFrFKJuSW6Wbm5iZU5yarFucnJiXl1qka6KXm1mil5pSuokRHKaS/DsYvx1U OsQowMGoxMN701vEX4g1say4MvcQoyQHk5Iob8dNoBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR XkEfoBxvSmJlVWpRPkxKmoNFSZxXTeudn5BAemJJanZqakFqEUxWhoNDSYJ39W2gRsGi1PTU irTMnBKENBMHJ8hwHqDhC0FqeIsLEnOLM9Mh8qcYFaXEeRtBEgIgiYzSPLheWBp5xSgO9Iow RDsPMAXBdb8CGswENDinVQhkcEkiQkqqgXGudW5I0OvG4k/S+kHXJCxqa+ZsmbZF0Gn1LMkT T41ZDgV2r/noHfg3c9YXVudlB/b8EM58XVl4njt21+oq3Ygnq6+H1cTmFOewiucXehem8+xu OiLM4uDfvCb7G+cKP1Enhc3h6jxV6hrR6j8slAwjnLpt42dsWtCvdLAw53z0Ek3znxNFlViK MxINtZiLihMBIoeP6P4CAAA= Cc: freebsd-current@freebsd.org Subject: Re: 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2012 02:25:57 -0000 On Mon, 16 Jan 2012, deeptech71@gmail.com wrote: > Every time I run mergemaster, I have to manually confirm all of the What is your timescale for "every time"? One year? Five years? > 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 That is correct up to a point. Now that the main src repository is stored in subversion, a svn2cvs exporter is used to populate a cloned CVS tree which is then used for csup and friends. However, the svn2cvs exporter deals poorly with branches and causes "version number churn" on many files. > 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? Perhaps, but it's not entirely clear. Have you considered the -F or -U options to mergemaster? If I remember correctly, -F was added precisely because of this issue you are encountering. > > 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? Oh, probably the output, but I'm not authoritative. > 2. mergemaster outputs "Use 'i' to install merged file". TODO: add a "the". Constructions of this form are quite common in technical writing, though I would not object to the addition of the 'the'. > 3. The BUGS section of mergemaster's manpage is redundant. Maybe, but sometimes it's worth explicitly mentioning things which should go without saying. -Ben Kaduk