From owner-freebsd-bugs@FreeBSD.ORG Fri Feb 6 02:00:38 2004 Return-Path: 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 7C93B16A4CE for ; Fri, 6 Feb 2004 02:00:38 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5CC8843D45 for ; Fri, 6 Feb 2004 02:00:36 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i16A0abv040632 for ; Fri, 6 Feb 2004 02:00:36 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i16A0aTh040630; Fri, 6 Feb 2004 02:00:36 -0800 (PST) (envelope-from gnats) Resent-Date: Fri, 6 Feb 2004 02:00:36 -0800 (PST) Resent-Message-Id: <200402061000.i16A0aTh040630@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, Divacky Roman Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1654516A4CE for ; Fri, 6 Feb 2004 01:59:05 -0800 (PST) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.10.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFB6B43D1D for ; Fri, 6 Feb 2004 01:59:02 -0800 (PST) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (8.12.11/8.12.9) with ESMTP id i169ww1L006001 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Fri, 6 Feb 2004 10:58:59 +0100 (CET) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.12.11/8.12.5/Submit) id i169wwcK006000; Fri, 6 Feb 2004 10:58:58 +0100 (CET) Message-Id: <200402060958.i169wwcK006000@eva.fit.vutbr.cz> Date: Fri, 6 Feb 2004 10:58:58 +0100 (CET) From: Divacky Roman To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: misc/62420: mergemaster update X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Divacky Roman List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Feb 2004 10:00:38 -0000 >Number: 62420 >Category: misc >Synopsis: mergemaster update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Fri Feb 06 02:00:35 PST 2004 >Closed-Date: >Last-Modified: >Originator: Divacky Roman >Release: FreeBSD 5.2-CURRENT i386 >Organization: home >Environment: System: FreeBSD eva.fit.vutbr.cz 4.9-STABLE FreeBSD 4.9-STABLE #0: Thu Feb 5 21:22:24 CET 2004 root@tereza.fit.vutbr.cz:/home/src/sys/sys-49/compile/EVA i386 >Description: This patch allows you to define which files you dont want to update while mergemastering... usefull when you have you cshrc etc files >How-To-Repeat: apply this patch and define IGNORE="/etc/something /etc/something.else" in your .mergemasterrc >Fix: --- /usr/sbin/mergemaster Sat Jan 24 12:33:55 2004 +++ mergemaster Sun Feb 1 09:46:43 2004 @@ -556,6 +556,13 @@ ;; esac + # dont touch this files + if [ ! -z "${IGNORE}" ]; then + for tmp in ${IGNORE}; do + rm -f ${TEMPROOT}${tmp} + done + fi + # Avoid trying to update MAKEDEV if /dev is on a devfs if /sbin/sysctl vfs.devfs.generation > /dev/null 2>&1 ; then rm -f ${TEMPROOT}/dev/MAKEDEV ${TEMPROOT}/dev/MAKEDEV.local >Release-Note: >Audit-Trail: >Unformatted: