Re: freebsd-update and mergemaster
Chris Maness [EMAIL PROTECTED] 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? ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: freebsd-update and mergemaster
Chris Maness [EMAIL PROTECTED] 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 ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
Re: freebsd-update and mergemaster
Who is working on FreeBSD update? Maybe I can make a feature request. Or, even better, make a patch - FreeBSD is open source, everyone can work on it! Sorry, couldn't resist :-). I know the above remark is generally not very helpful for an average user; however, I was surprised to find out that the freebsd-update(8) was actually a shell script - i.e. modifying it doesn't require one to be a hard-core C hacker. freebsd-update(8) is part of the base system and is, as such, in the source tree that is freely available from the CVS repository (http://www.freebsd.org/cgi/cvsweb.cgi/src/usr.sbin/freebsd-update/). Being a shell script also means you can go directly to /usr/sbin/freebsd-update and edit it in-place. The author, to the best of my knowledge, is Colin Percival, the current FreeBSD security officer (http://www.freebsd.org/security/index.html#sec). Regards, -- Nino ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
freebsd-update and mergemaster
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. Chris Maness ___ freebsd-questions@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-questions To unsubscribe, send any mail to [EMAIL PROTECTED]
