Date: Fri, 13 Mar 2009 10:54:33 +1030 From: "Daniel O'Connor" <doconnor@gsoft.com.au> To: freebsd-stable@freebsd.org, antik@bsd.ee Subject: Re: mergemaster annoyance or not? Message-ID: <200903131054.40000.doconnor@gsoft.com.au> In-Reply-To: <200903121505.n2CF5RXx047734@lurza.secnetix.de> References: <200903121505.n2CF5RXx047734@lurza.secnetix.de>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart1757167.ATj9rlvmg7 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Friday 13 March 2009 01:35:27 Oliver Fromme wrote: > 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. Perhaps they should be suggested in the man page.. I agree it's a POLA violation, but it is rather annoying they can't be made= =20 the default as it is very much more pleasant to use with those options - th= e=20 defaults can be a recipe for either extreme tedium, or errors depending on = how=20 patient you are :) I wonder how hard it would be to add 3 way merging (like sysutils/etcmerge)= to=20 mergemaster.. =2D-=20 Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C --nextPart1757167.ATj9rlvmg7 Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iD8DBQBJuafC5ZPcIHs/zowRAm3qAJ47wZGnVjg/+M8zECMIU8HKDVq0ZACfTKQT 9EweZwFCiSwnmgQti0EJf/4= =mzm9 -----END PGP SIGNATURE----- --nextPart1757167.ATj9rlvmg7--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903131054.40000.doconnor>