Date: Sat, 17 Nov 2007 14:03:37 +0000 From: RW <fbsd06@mlists.homeunix.com> To: freebsd-questions@freebsd.org Subject: Re: sysutils/etcmerge vs mergemaster Message-ID: <20071117140337.513fb3e3@gumby.homeunix.com.> In-Reply-To: <200711171116.06705.peter.schuller@infidyne.com> References: <200711171116.06705.peter.schuller@infidyne.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 17 Nov 2007 11:15:58 +0100 Peter Schuller <peter.schuller@infidyne.com> wrote: > Hello, > > etcmerge, with three-way merging, has been available for a while, but > the man page still warns of it not being extensively tested, and of > course mergermaster still seems to be the officially supported tool. > > In spite of this, etcmerge is attractive since, to be honest, > manually saying "yes update" to a bunch of files that mostly have > only CVS revision changes is a waste of time. Isn't that what the -U option in mergemaster does? -U Attempt to auto upgrade files that have not been user modified. BTW does etcmerge handle the merging of passwd and groups well, because that's what I hate more than anything else about upgrading.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071117140337.513fb3e3>