From owner-freebsd-stable@FreeBSD.ORG Thu Sep 29 00:05:43 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 9A87616A41F; Thu, 29 Sep 2005 00:05:43 +0000 (GMT) (envelope-from brad@stop.mail-abuse.org) Received: from vhost109.his.com (vhost109.his.com [216.194.225.101]) by mx1.FreeBSD.org (Postfix) with ESMTP id E54AC43D4C; Thu, 29 Sep 2005 00:05:42 +0000 (GMT) (envelope-from brad@stop.mail-abuse.org) Received: from [10.0.1.210] (localhost.his.com [127.0.0.1]) by vhost109.his.com (8.12.11/8.12.3) with ESMTP id j8T05dL2055000; Wed, 28 Sep 2005 20:05:40 -0400 (EDT) (envelope-from brad@stop.mail-abuse.org) Mime-Version: 1.0 Message-Id: In-Reply-To: <433B1DF7.9020303@FreeBSD.org> References: <433B1DF7.9020303@FreeBSD.org> Date: Thu, 29 Sep 2005 01:53:59 +0200 To: Doug Barton From: Brad Knowles Content-Type: text/plain; charset="us-ascii" ; format="flowed" Cc: Brad Knowles , 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 00:05:43 -0000 At 3:49 PM -0700 2005-09-28, Doug Barton wrote: > 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 checked the man page. There is no direct "ignore" option, although there is a "strict" option. If you set up an /etc/mergemaster.rc, you can set up "DIFF_OPTIONS=" value, and there is an example of how to do that so that it ignores FreeBSD CVS Id tags. However, I was talking about ignoring all differences that occur only in comments (not just FreeBSD CVS Id tags), and it's not obvious as to how to modify the "DIFF_OPTIONS=" setting to suit. Moreover, I was hoping for a command-line option to control this setting, and that it might be set by default -- no /etc/mergemaster.rc required. -- Brad Knowles, "Those who would give up essential Liberty, to purchase a little temporary Safety, deserve neither Liberty nor Safety." -- Benjamin Franklin (1706-1790), reply of the Pennsylvania Assembly to the Governor, November 11, 1755 SAGE member since 1995. See for more info.