Date: Fri, 6 Feb 2004 10:58:58 +0100 (CET) From: Divacky Roman <xdivac02@stud.fit.vutbr.cz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: misc/62420: mergemaster update Message-ID: <200402060958.i169wwcK006000@eva.fit.vutbr.cz> Resent-Message-ID: <200402061000.i16A0aTh040630@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402060958.i169wwcK006000>