From owner-freebsd-bugs@FreeBSD.ORG  Tue Feb  2 18:50:03 2010
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9AFD0106568B
	for <freebsd-bugs@hub.freebsd.org>;
	Tue,  2 Feb 2010 18:50:03 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 5FE3B8FC1C
	for <freebsd-bugs@hub.freebsd.org>;
	Tue,  2 Feb 2010 18:50:03 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o12Io3wk092006
	for <freebsd-bugs@freefall.freebsd.org>; Tue, 2 Feb 2010 18:50:03 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o12Io3ZS092005;
	Tue, 2 Feb 2010 18:50:03 GMT (envelope-from gnats)
Resent-Date: Tue, 2 Feb 2010 18:50:03 GMT
Resent-Message-Id: <201002021850.o12Io3ZS092005@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	Karl Lehenbauer <karl@flightaware.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C2B611065670
	for <freebsd-gnats-submit@FreeBSD.org>;
	Tue,  2 Feb 2010 18:44:16 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id B24F48FC1E
	for <freebsd-gnats-submit@FreeBSD.org>;
	Tue,  2 Feb 2010 18:44:16 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o12IiGvi016790
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 2 Feb 2010 18:44:16 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o12IiGcc016789;
	Tue, 2 Feb 2010 18:44:16 GMT (envelope-from nobody)
Message-Id: <201002021844.o12IiGcc016789@www.freebsd.org>
Date: Tue, 2 Feb 2010 18:44:16 GMT
From: Karl Lehenbauer <karl@flightaware.com>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc: 
Subject: misc/143497: make mergemaster do the right thing automatically if
	the only difference in the file is comments
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2010 18:50:03 -0000


>Number:         143497
>Category:       misc
>Synopsis:       make mergemaster do the right thing automatically if the only difference in the file is comments
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 02 18:50:03 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Karl Lehenbauer
>Release:        8.0-STABLE
>Organization:
FlightAware, LLC
>Environment:
FreeBSD papa.hou.flightaware.com 8.0-STABLE FreeBSD 8.0-STABLE #0: Tue Feb  2 11:26:14 CST 2010     karl@papa.hou.flightaware.com:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
Most of the files mergemaster presents for consideration are identical except for a comment line.

Please modify mergemaster to either by default install files that only differ by a comment automatically or add a switch to do that.

>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
>Unformatted: