Date: Mon, 3 Mar 2008 08:10:52 -0800 (PST) From: chris@chrismaness.com To: freebsd-questions@freebsd.org Subject: Re: freebsd-update and mergemaster Message-ID: <1562.163.150.112.33.1204560652.squirrel@squirrel.kq6up.org>
next in thread | raw e-mail | index | archive | help
> Chris Maness <chris@chrismaness.com> writes: > >> I was wondering if it was possible to use mergemaster with the binary >> update tool. It seemed like a much better way than freebsd-update >> dumping me into vi. I don't understand what it wants me to do with >> vi. Mergemaster is very clear. Can someone please shed light. > > Mergemaster just uses sdiff(1). Perhaps freebsd-update can be > configured (e.g., with an EDITOR setting) to do the same? > The mergemaster is a nice implementation as it really lets you see what is going on during the whole process. I like the the whole script as it lets you choose what version you want to keep for each and every file. Who is working on FreeBSD update? Maybe I can make a feature request. Chris
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1562.163.150.112.33.1204560652.squirrel>