Date: Thu, 24 Aug 2000 13:52:16 -0700 (MST) From: John Reynolds <jjreynold@home.com> To: stable@freebsd.org Subject: Re: mergemaster wishlist Message-ID: <14757.35584.883502.284470@whale.home-net> In-Reply-To: <200008240428.AAA31509@sanson.reyes.somos.net> References: <Pine.BSF.4.21.0008231157210.7876-100000@dt051n1f.san.rr.com> <200008240428.AAA31509@sanson.reyes.somos.net>
next in thread | previous in thread | raw e-mail | index | archive | help
[ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?14757.35584.883502.284470>