Date: Tue, 08 Nov 2005 00:38:16 +0100 From: Matthias Andree <matthias.andree@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: bin/88629: mergemaster -i should replace files that only change $FreeBSD$ Message-ID: <E1EZGZ6-0001Z2-R1@libertas.emma.line.org> Resent-Message-ID: <200511072340.jA7NeEC6065337@freefall.freebsd.org>
index | next in thread | raw e-mail
>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:help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1EZGZ6-0001Z2-R1>