From nobody@FreeBSD.org  Fri Jul  6 16:58:19 2012
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 57471106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 Jul 2012 16:58:19 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 41E5F8FC1A
	for <freebsd-gnats-submit@FreeBSD.org>; Fri,  6 Jul 2012 16:58:19 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q66GwJED066223
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 6 Jul 2012 16:58:19 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q66GwJFI066222;
	Fri, 6 Jul 2012 16:58:19 GMT
	(envelope-from nobody)
Message-Id: <201207061658.q66GwJFI066222@red.freebsd.org>
Date: Fri, 6 Jul 2012 16:58:19 GMT
From: Thomas Limoncelli <tal@whatexit.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: freebsd-update's merge procedure should automate certain diff partterns
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         169685
>Category:       bin
>Synopsis:       freebsd-update(8): merge procedure should automate certain diff patterns
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    cperciva
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 06 17:00:28 UTC 2012
>Closed-Date:    
>Last-Modified:  Sun Apr 13 23:26:03 UTC 2014
>Originator:     Thomas Limoncelli
>Release:        8.2-RELEASE
>Organization:
>Environment:
FreeBSD gsp.whatexit.org 8.2-RELEASE-p9 FreeBSD 8.2-RELEASE-p9 #6: Fri Jul  6 10:50:05 EDT 2012     root@gsp.whatexit.org:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
[this is a feature request for freebsd-update]

When freebsd-update merges configuration files many of them have no change except a version number or copyright year.  It would be super awesome if those were handled automatically.

 Example 1: Eliminating the text between $...$ would make these lines "the same".

 <<<<<<< current version
 # $FreeBSD: src/contrib/sendmail/cf/m4/cfhead.m4,v 1.17 2004/08/01 01:16:14 gshapiro Exp $
 =======
 # $FreeBSD: src/contrib/sendmail/cf/m4/cfhead.m4,v 1.17.30.3.2.1 2012/03/03 06:15:13 kensmith Exp $
 >>>>>>> 8.3-RELEASE
 
 Example 2: Lines that start "# Copyright" could probably be assumed that the user wants the newer version.
 
 <<<<<<< current version
 # Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers.
 =======
 # Copyright (c) 1998-2004, 2009, 2010 Sendmail, Inc. and its suppliers.
 >>>>>>> 8.3-RELEASE
 
>How-To-Repeat:
Run freebsd-update and get to the file merge phase.
>Fix:
Manually deleting the lines from the older file.

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->cperciva 
Responsible-Changed-By: crees 
Responsible-Changed-When: Fri Jul 6 19:15:32 UTC 2012 
Responsible-Changed-Why:  
Assign responsible 

http://www.freebsd.org/cgi/query-pr.cgi?pr=169685 
Responsible-Changed-From-To: cperciva->cperciva 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun Apr 13 23:24:27 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer. 

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