From owner-freebsd-bugs@FreeBSD.ORG Mon Nov 7 23:40:26 2005 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCBD016A424 for ; Mon, 7 Nov 2005 23:40:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 85AA443D93 for ; Mon, 7 Nov 2005 23:40:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jA7NeE5U065338 for ; Mon, 7 Nov 2005 23:40:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jA7NeEC6065337; Mon, 7 Nov 2005 23:40:14 GMT (envelope-from gnats) Resent-Date: Mon, 7 Nov 2005 23:40:14 GMT Resent-Message-Id: <200511072340.jA7NeEC6065337@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, Matthias Andree Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7724D16A41F for ; 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 ; 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 ; 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 ; 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 ; 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: Date: Tue, 08 Nov 2005 00:38:16 +0100 From: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/88629: mergemaster -i should replace files that only change $FreeBSD$ X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Nov 2005 23:40:27 -0000 >Number: 88629 >Category: bin >Synopsis: mergemaster -i should replace files that only change $FreeBSD$ >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: Mon Nov 07 23:40:13 GMT 2005 >Closed-Date: >Last-Modified: >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: >Unformatted: