From nobody@FreeBSD.org  Tue Feb  2 18:44:16 2010
Return-Path: <nobody@FreeBSD.org>
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
Subject: make mergemaster do the right thing automatically if the only difference in the file is comments
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         143497
>Category:       bin
>Synopsis:       [request] make mergemaster(8) do the right thing automatically if the only difference in the file is comments
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 02 18:50:03 UTC 2010
>Closed-Date:    Tue Feb 02 19:41:39 UTC 2010
>Last-Modified:  Tue Feb 02 19:41:39 UTC 2010
>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:
Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Feb 2 19:17:27 UTC 2010 
Responsible-Changed-Why:  
reclassify. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143497 
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Tue Feb 2 19:39:50 UTC 2010 
State-Changed-Why:  

Mergemaster already has more automated features than I'm comfortable with, 
and since you've provided no patch to implement your suggestion I have nothing 
to evaluate in terms of an actual change request.  

You should probably read the man page, especially the -U option which will 
likely do all you want and more.  


hope this helps, 

Doug 

http://www.freebsd.org/cgi/query-pr.cgi?pr=143497 
>Unformatted:
