From owner-freebsd-current@FreeBSD.ORG Tue Jan 17 03:13:29 2012 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 5FCCD106566B for ; Tue, 17 Jan 2012 03:13:29 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 4D3971532D4; Tue, 17 Jan 2012 03:13:28 +0000 (UTC) Message-ID: <4F14E757.1010505@FreeBSD.org> Date: Mon, 16 Jan 2012 19:13:27 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20111222 Thunderbird/9.0 MIME-Version: 1.0 To: "deeptech71@gmail.com" References: In-Reply-To: X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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 03:13:29 -0000 On 01/15/2012 23:31, deeptech71@gmail.com wrote: > Apparently, some upstream files have the following VCS Id: > # $FreeBSD$ > and that anulls version checking. Your src tree is not checked out properly. This usually happens because at some point in the subversion 1.6 days you used devel/subversion to check it out, rather than devel/subversion-freebsd. Fortunately, the new version of devel/subversion has the option to include the FreeBSD-specific bits, enabled by default. So, to fix this problem: 1. 'svn diff' your src tree, save any local patches. 2. rm -rf /usr/src 3. Upgrade devel/subversion, make sure that the first 3 options are enabled. 4. Check out the new src tree, re-apply any local patches 5. Run mergemaster again. Make sure to merge the new $FreeBSD Ids. > BTW, off-topic: > 1. mergemaster outputs "CVS Id", while mergemaster's manpage contains > "VCS Id". One of these is WRONG(TM). Which one? The 'CVS Id' is a remnant of the pre-svn days. I haven't changed it in case someone has a script that parses the output. > 2. mergemaster outputs "Use 'i' to install merged file". TODO: add a "the". Maybe. It's lasted as long as it has without anyone getting confused. > 3. The BUGS section of mergemaster's manpage is redundant. So don't read it. :) Doug -- It's always a long day; 86400 doesn't fit into a short. Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/