From owner-freebsd-stable@FreeBSD.ORG Thu Sep 29 02:41:25 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 D649416A41F for ; Thu, 29 Sep 2005 02:41:25 +0000 (GMT) (envelope-from zanchey@ucc.gu.uwa.edu.au) Received: from asclepius.uwa.edu.au (asclepius2.uwa.edu.au [130.95.128.59]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07F3543D5A for ; Thu, 29 Sep 2005 02:41:24 +0000 (GMT) (envelope-from zanchey@ucc.gu.uwa.edu.au) Received: from asclepius.kas (localhost.localdomain [127.0.0.1]) by asclepius.uwa.edu.au (Postfix) with SMTP id 737D9183CBB for ; Thu, 29 Sep 2005 10:41:22 +0800 (WST) Received: from asclepius (localhost.localdomain [127.0.0.1]) by asclepius.prekas (Postfix) with SMTP id 6CDDD183CA0 for ; Thu, 29 Sep 2005 10:41:22 +0800 (WST) X-UWA-Client-IP: 130.95.13.9 (UWA) Received: from mooneye.ucc.gu.uwa.edu.au (mooneye.ucc.gu.uwa.edu.au [130.95.13.9]) by asclepius.extinput (Postfix) with ESMTP id 54D56183C59 for ; Thu, 29 Sep 2005 10:41:22 +0800 (WST) Received: by mooneye.ucc.gu.uwa.edu.au (Postfix, from userid 801) id 07F9A17E8B; Thu, 29 Sep 2005 10:41:20 +0800 (WST) Received: from mussel.ucc.gu.uwa.edu.au (mussel.ucc.gu.uwa.edu.au [130.95.13.18]) by mooneye.ucc.gu.uwa.edu.au (Postfix) with ESMTP id C1D1C17E7D; Thu, 29 Sep 2005 10:41:20 +0800 (WST) Received: from zanchey (helo=localhost) by mussel.ucc.gu.uwa.edu.au with local-esmtp (Exim 3.36 #1 (Debian)) id 1EKoMK-00089X-00; Thu, 29 Sep 2005 10:41:20 +0800 Date: Thu, 29 Sep 2005 10:41:20 +0800 (WST) From: David Adam To: Brad Knowles In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-SpamTest-Info: Profile: Formal (269/050913) X-SpamTest-Info: Profile: Detect Hard [UCS 290904] X-SpamTest-Info: Profile: SysLog X-SpamTest-Info: Profile: Marking Spam - Subject (UCS) [02-08-04] X-SpamTest-Status: Not detected X-SpamTest-Version: SMTP-Filter Version 2.0.0 [0125], KAS/Release 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: Thu, 29 Sep 2005 02:41:26 -0000 Brad, On Wed, 28 Sep 2005, 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. That way, many fewer "fluff" changes > would be presented during the merge process, and people would be left > with needing to confirm changes regarding only actual functional code. It's been mentioned on this list before, but sysutils/etcmerge can often provide a much faster way of bringing your system up to spec. Takes a bit of getting used to, but definitely worthwhile. David Adam zanchey@ucc.gu.uwa.edu.au