From xdivac02@stud.fit.vutbr.cz  Fri Feb  6 01:59:05 2004
Return-Path: <xdivac02@stud.fit.vutbr.cz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1654516A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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 <xdivac02@stud.fit.vutbr.cz>
Reply-To: Divacky Roman <xdivac02@stud.fit.vutbr.cz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: mergemaster update
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         62420
>Category:       misc
>Synopsis:       mergemaster update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 06 02:00:35 PST 2004
>Closed-Date:    Tue Feb 10 18:16:08 PST 2004
>Last-Modified:  Tue Feb 10 18:16:08 PST 2004
>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:
Responsible-Changed-From-To: freebsd-bugs->dougb 
Responsible-Changed-By: kris 
Responsible-Changed-When: Sun Feb 8 20:47:13 PST 2004 
Responsible-Changed-Why:  
Assign to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62420 
State-Changed-From-To: open->closed 
State-Changed-By: dougb 
State-Changed-When: Tue Feb 10 18:14:35 PST 2004 
State-Changed-Why:  

This is better handled by using a MM_PRE_COMPARE_SCRIPT 
that simply removes the files you don't want to work with 
from TEMPROOT. 

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