From owner-freebsd-stable Thu Aug 24 13:52:21 2000 Delivered-To: freebsd-stable@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 4B79237B42C for ; Thu, 24 Aug 2000 13:52:17 -0700 (PDT) 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 NAA08152 for ; Thu, 24 Aug 2000 13:52:17 -0700 (MST) (envelope-from jjreynold@home.com) Received: (from jjreynold@localhost) by whale.home-net (8.9.3/8.9.3) id NAA02226; Thu, 24 Aug 2000 13:52:17 -0700 (MST) (envelope-from jjreynold@home.com) From: John Reynolds MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <14757.35584.883502.284470@whale.home-net> Date: Thu, 24 Aug 2000 13:52:16 -0700 (MST) To: stable@freebsd.org Subject: Re: mergemaster wishlist In-Reply-To: <200008240428.AAA31509@sanson.reyes.somos.net> References: <200008240428.AAA31509@sanson.reyes.somos.net> X-Mailer: VM 6.75 under Emacs 20.7.1 Cc: Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG [ On Thursday, August 24, Francisco Reyes wrote: ] > > I gave this a little thought.. There is one way to go about it > that will bypass comparisons altogheter. > > Instead of comparing each file against the exeption list one > could process the exception list upfront. > Files to be merged automatically will be copied.. files to be > ignored would be deleted. > > What do you think of this approach? you mean like this: --- /usr/sbin/mergemaster Thu Aug 10 07:13:42 2000 +++ mergemaster Wed Jul 19 22:04:07 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 Just have IGNORE_FILE="/etc/mergemaster.ignore" # or whatever in your .mergemasterrc file and put 1 file per line in this file. Works for me. -Jr -- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= 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 4.1-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-stable" in the body of the message