From matthias.andree@gmx.de  Mon Nov  7 23:38:26 2005
Return-Path: <matthias.andree@gmx.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7724D16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  7 Nov 2005 23:38:26 +0000 (GMT)
	(envelope-from matthias.andree@gmx.de)
Received: from mail.dt.e-technik.uni-dortmund.de (krusty.dt.E-Technik.Uni-Dortmund.DE [129.217.163.1])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E3F4F43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  7 Nov 2005 23:38:25 +0000 (GMT)
	(envelope-from matthias.andree@gmx.de)
Received: from localhost (localhost [127.0.0.1])
	by mail.dt.e-technik.uni-dortmund.de (Postfix) with ESMTP id E9FA044561
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Nov 2005 00:38:23 +0100 (CET)
Received: from mail.dt.e-technik.uni-dortmund.de ([127.0.0.1])
 by localhost (krusty [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
 id 09983-09 for <FreeBSD-gnats-submit@freebsd.org>;
 Tue,  8 Nov 2005 00:38:22 +0100 (CET)
Received: from m2a2.dyndns.org (p509127F0.dip0.t-ipconnect.de [80.145.39.240])
	by mail.dt.e-technik.uni-dortmund.de (Postfix) with ESMTP id 07A5644093
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Nov 2005 00:38:19 +0100 (CET)
Received: from localhost (localhost [127.0.0.1])
	by merlin.emma.line.org (Postfix) with ESMTP id C4C782008E0;
	Tue,  8 Nov 2005 00:38:18 +0100 (CET)
Received: from m2a2.dyndns.org ([127.0.0.1])
 by localhost (m2a2.dyndns.org [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 25947-07; Tue,  8 Nov 2005 00:38:17 +0100 (CET)
Received: from libertas.emma.line.org (libertas.emma.line.org [192.168.1.2])
	by merlin.emma.line.org (Postfix) with ESMTP id 533A9200795;
	Tue,  8 Nov 2005 00:38:17 +0100 (CET)
Received: from emma by libertas.emma.line.org with local (Exim 4.54 (FreeBSD))
	id 1EZGZ6-0001Z2-R1; Tue, 08 Nov 2005 00:38:16 +0100
Message-Id: <E1EZGZ6-0001Z2-R1@libertas.emma.line.org>
Date: Tue, 08 Nov 2005 00:38:16 +0100
From: Matthias Andree <matthias.andree@gmx.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: mergemaster -i should replace files that only change $FreeBSD$ 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         88629
>Category:       bin
>Synopsis:       mergemaster -i should replace files that only change $FreeBSD$
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 07 23:40:13 GMT 2005
>Closed-Date:    Tue Nov 22 20:54:16 GMT 2005
>Last-Modified:  Tue Nov 22 20:54:16 GMT 2005
>Originator:     Matthias Andree
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD libertas.emma.line.org 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Mon Nov 7 16:10:51 CET 2005 toor@libertas.emma.line.org:/usr/obj/usr/src/sys/MA5L i386


	
>Description:
Upgrading from RELENG_4_11 and then to RELENG_5 and from there to RELENG_6_0,
I ran mergemaster -i after each upgrade. The RELENG_6_0 update asked for
heaps of /etc/ files if I wanted to install the upgraded version.

Please change mergemaster so that the "-i" option will silently install
a new file if the only change affects the $FreeBSD: ...$ line.
	
>How-To-Repeat:
	
>Fix:

	
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Nov 8 00:21:51 GMT 2005 
Responsible-Changed-Why:  
Over to mergemaster maintainer for evaluation. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=88629 

From: Oliver Fromme <olli@lurza.secnetix.de>
To: bug-followup@FreeBSD.ORG, matthias.andree@gmx.de
Cc:  
Subject: Re: bin/88629: mergemaster -i should replace files that only change 	$FreeBSD$
Date: Tue, 8 Nov 2005 17:05:04 +0100 (CET)

 Matthias Andree <matthias.andree@gmx.de> wrote:
  > 
  > > Number:         88629
  > > Category:       bin
  > > Synopsis:       mergemaster -i should replace files that only change $FreeBSD$
  >         
  > > Description:
  > Upgrading from RELENG_4_11 and then to RELENG_5 and from there to RELENG_6_0,
  > I ran mergemaster -i after each upgrade. The RELENG_6_0 update asked for
  > heaps of /etc/ files if I wanted to install the upgraded version.
  > 
  > Please change mergemaster so that the "-i" option will silently install
  > a new file if the only change affects the $FreeBSD: ...$ line.
 
 You can already configure mergemaster to do that.
 Add the this line to your /etc/mergemaster.rc file:
 
 DIFF_OPTIONS='-I$FreeBSD:.*[$]'
 
 See the mergemaster(8) manpage for details.
 
 Best regards
    Oliver
 
 -- 
 Oliver Fromme,  secnetix GmbH & Co. KG, Marktplatz 29, 85567 Grafing
 Dienstleistungen mit Schwerpunkt FreeBSD: http://www.secnetix.de/bsd
 Any opinions expressed in this message may be personal to the author
 and may not necessarily reflect the opinions of secnetix in any way.
 
 "It combines all the worst aspects of C and Lisp:  a billion different
 sublanguages in one monolithic executable.  It combines the power of C
 with the readability of PostScript."
         -- Jamie Zawinski, when asked: "What's wrong with perl?"

From: Matthias Andree <matthias.andree@gmx.de>
To: Oliver Fromme <olli@lurza.secnetix.de>
Cc: bug-followup@FreeBSD.ORG
Subject: Re: bin/88629: mergemaster -i should replace files that only change 	$FreeBSD$
Date: Tue, 8 Nov 2005 19:31:11 +0100

 Oliver Fromme schrieb am 2005-11-08:
 
 > You can already configure mergemaster to do that.
 > Add the this line to your /etc/mergemaster.rc file:
 > 
 > DIFF_OPTIONS='-I$FreeBSD:.*[$]'
 > 
 > See the mergemaster(8) manpage for details.
 
 Would it harm to make this default behavior for "mergemaster -i"?
 
 -- 
 Matthias Andree

From: Oliver Fromme <olli@lurza.secnetix.de>
To: matthias.andree@gmx.de (Matthias Andree)
Cc: bug-followup@FreeBSD.ORG
Subject: Re: bin/88629: mergemaster -i should replace files that only change     $FreeBSD$
Date: Wed, 9 Nov 2005 15:07:19 +0100 (CET)

 Matthias Andree wrote:
  > Oliver Fromme schrieb am 2005-11-08:
  > > You can already configure mergemaster to do that.
  > > Add the this line to your /etc/mergemaster.rc file:
  > > 
  > > DIFF_OPTIONS='-I$FreeBSD:.*[$]'
  > > 
  > > See the mergemaster(8) manpage for details.
  > 
  > Would it harm to make this default behavior for "mergemaster -i"?
 
 I think it would harm those people who rely on the default
 behaviour.  And it's not a big deal to add a line to the
 mergemaster.rc file, so the default should stay as-is.
 
 It also seems that mergemaster is known to be very strict
 and conservative with displaying changes, and a lot of
 people are used to that behaviour.
 
 Personally I have a patch to enable specifying files that
 should always be installed without asking (e.g. I always
 want the mtree files to be updated without bothering to be
 asked about them).  I haven't submittet that patch yet
 because I don't think it would get committed, for the
 reasons mentioned above (conservatism).
 
 Best regards
    Oliver
 
 -- 
 Oliver Fromme,  secnetix GmbH & Co. KG, Marktplatz 29, 85567 Grafing
 Dienstleistungen mit Schwerpunkt FreeBSD: http://www.secnetix.de/bsd
 Any opinions expressed in this message may be personal to the author
 and may not necessarily reflect the opinions of secnetix in any way.
 
 "Being really good at C++ is like being really good
 at using rocks to sharpen sticks."
         -- Thant Tessman
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Tue Nov 22 20:53:26 GMT 2005 
State-Changed-Why:  

The lively discussion in this PR covers the topic, IMO. 

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