From owner-freebsd-stable@FreeBSD.ORG Wed Sep 28 23:15:22 2005 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F89516A41F for ; Wed, 28 Sep 2005 23:15:22 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mail2.fluidhosting.com [204.14.90.62]) by mx1.FreeBSD.org (Postfix) with SMTP id C86B043D48 for ; Wed, 28 Sep 2005 23:15:17 +0000 (GMT) (envelope-from dougb@FreeBSD.org) Received: (qmail 97199 invoked by uid 399); 28 Sep 2005 23:15:16 -0000 Received: from mail1.fluidhosting.com (204.14.90.61) by mail2.fluidhosting.com with SMTP; 28 Sep 2005 23:15:16 -0000 Received: (qmail 36116 invoked by uid 399); 28 Sep 2005 23:15:16 -0000 Received: from localhost (HELO ?192.168.0.5?) (dougb@dougbarton.net@127.0.0.1) by localhost with SMTP; 28 Sep 2005 23:15:16 -0000 Message-ID: <433B2404.5010806@FreeBSD.org> Date: Wed, 28 Sep 2005 16:15:16 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Mozilla Thunderbird 1.0.6 (Windows/20050716) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Robert Backhaus References: <433B1DF7.9020303@FreeBSD.org> In-Reply-To: X-Enigmail-Version: 0.92.1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: FreeBSD-STABLE Mailing List Subject: Re: Advice sought on upgrading from 4.11-R to 5.4... 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: Wed, 28 Sep 2005 23:15:22 -0000 Robert Backhaus wrote: > On 9/29/05, Doug Barton wrote: > >>Brad Knowles wrote: >> >> >>> However, it would be nice if mergemaster could be made to >>>automatically accept changes that occur only in the comments of the >>>files it is trying to merge. >> >>What would be nice is if people actually read the man page for mergemaster, >>which has had this example in it for a long time now. > > > I just read the mergemaster man page (6.0B2 box), and it contains no > usch example, or reference. None of the options seem to have this > effect either. > > Maybe you are thinking of an Open- of NetBSD mergemaster? > Ah, I misread the original message. Usually people are complaining about the CVS Ids in the comments, as opposed to the comments themselves. I disagree that ignoring comments in the files is a good idea. There is no way for mergemaster to know for sure if the comment is material or not, that's the admin's job. Upgrading across a major version is a difficult task, no matter how its approached. IIRC, the original example was upgrading from 4.x to 5.x, which, like most major version upgrades, should be done by backing up your data and doing a fresh install anyway. This is particularly important over the 4 -> 5 change, since by upgrading from source you're missing the UFS2 update. Thanks for pointing out that I missed the detail in the original post in any case. Doug