Date: Fri, 13 Mar 2009 11:18:25 +0700 From: Eugene Grosbein <eugen@kuzbass.ru> To: freebsd-stable@freebsd.org, antik@bsd.ee Subject: Re: mergemaster annoyance or not? Message-ID: <20090313041825.GA56699@svzserv.kemerovo.su> In-Reply-To: <200903121505.n2CF5RXx047734@lurza.secnetix.de> References: <49B8AB66.9080408@bsd.ee> <200903121505.n2CF5RXx047734@lurza.secnetix.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Mar 12, 2009 at 04:05:27PM +0100, Oliver Fromme wrote: > This is what I have in my /etc/mergemaster.rc; it will > probably help in your case: > > DIFF_FLAG='-Bub' > DIFF_OPTIONS='-I$FreeBSD:.*[$]' > IGNORE_MOTD=yes Yes, it helps and I like it. But I'm forced to put it to each and every box I install; that does not annoy me so much but other people are annoyed. > PS: I think the above options should _not_ be on by > default, because that would be a POLA violation. > Those people who want them can easily add them to their > mergemaster.rc file. I see this as POLA recovery because there where no such problem with mergemaster before switch to SVN. Eugene Grosbein
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090313041825.GA56699>