ports/169685: freebsd-update's merge procedure should automate certain diff partterns

[Thomas Limoncelli]

>Number:         169685
>Category:       ports
>Synopsis:       freebsd-update's merge procedure should automate certain diff partterns
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>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:
>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 at 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 $
>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:
>Unformatted:
 >>>>>>> 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