From owner-freebsd-hackers Mon Jan 10 21:21:50 2000 Delivered-To: freebsd-hackers@freebsd.org Received: from cx587235-a.chnd1.az.home.com (cx587235-a.chnd1.az.home.com [24.11.88.170]) by hub.freebsd.org (Postfix) with ESMTP id DD29014F66 for ; Mon, 10 Jan 2000 21:21:42 -0800 (PST) (envelope-from jjreynold@home.com) Received: from whale.home-net (whale [192.168.1.2]) by cx587235-a.chnd1.az.home.com (8.9.3/8.9.3) with ESMTP id WAA09886 for ; Mon, 10 Jan 2000 22:21:33 -0700 (MST) (envelope-from jjreynold@home.com) Received: (from jjreynold@localhost) by whale.home-net (8.9.3/8.9.3) id WAA54022; Mon, 10 Jan 2000 22:21:32 -0700 (MST) (envelope-from jjreynold@home.com) From: John and Jennifer Reynolds MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <14458.48604.671302.610902@whale.home-net> Date: Mon, 10 Jan 2000 22:21:32 -0700 (MST) To: freebsd-hackers@freebsd.org Subject: useful addition to mergemaster (patch included)? X-Mailer: VM 6.73 under Emacs 20.5.1 Cc: Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Hi all, I was tinkering with mergemaster tonight adding in something that seems useful to me. I track -stable and have found mergemaster very valuable--however, sometimes choosing 'd' over and over again for things I don't want touched (like root's .profile or .cshrc or /etc/networks, etc.) can get tedious. So, I made a quick hack to mergemaster so it would recognize a new "rc" variable called IGNORE_FILE. This file is a list of files mergemaster should ignore, or not compare. One filename per line. Now, when I run mergemaster, it automatically skips these sorts of files and only concentrates on things that need to be brought up-to-date. It's at least useful to me :) ... apply this patch and edit your /root/.mergemasterrc file appropriately and see what you think! --- /usr/sbin/mergemaster Fri Jan 7 23:48:28 2000 +++ mergemaster Mon Jan 10 22:03:31 2000 @@ -260,6 +260,23 @@ ;; esac + # Avoid comparing the files in IGNORE_FILE if the user specifies it in + # .mergemasterrc + # + case "${IGNORE_FILE}" in + '') ;; + *) echo "" + echo "*** IGNORE_FILE variable found in $HOME/.mergemasterrc" + echo " The following files will not be compared:" + echo "" + for tmpfile in `cat ${IGNORE_FILE} | xargs`; do + echo " - ${tmpfile}" + rm ${TEMPROOT}${tmpfile} + done + ;; + esac + + ;; # End of the "RERUN" test esac --------------------- man page --------------------- --- /usr/src/usr.sbin/mergemaster/mergemaster.8 Wed Nov 3 13:58:47 1999 +++ mergemaster.8 Mon Jan 10 22:08:13 2000 @@ -233,6 +233,10 @@ #PATH=/bin:/usr/bin:/usr/sbin # Don't compare the old and new motd files #IGNORE_MOTD=yes +# +# File to contain filenames (full path names) of files in / and /etc to +# ignore. One filename per line. +#IGNORE_FILE=/path/to/file .Ed .Sh SEE ALSO .Xr cvs 1 , -- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= John Reynolds Chandler Capabilities Engineering, CDS, Intel Corporation jreynold@sedona.ch.intel.com My opinions are mine, not Intel's. Running jjreynold@home.com FreeBSD 3.4-STABLE. FreeBSD: The Power to Serve. http://members.home.com/jjreynold/ Come join us!!! @ http://www.FreeBSD.org/ =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message