On Fri, Feb 25, 2011 at 10:00:19AM -0800, [email protected] wrote: > > On Fri, Feb 25, 2011 at 02:42:25PM +0100, Marco van Tol wrote: > >> > >> Read up on the mergemaster manual for options "-F" and "-i" :-) > > > > freebsd-update does not use mergemaster, though probably it should. > > My understanding is that freebsd-update was introduced prior to releases > being branched, so this issue surfaced at that time. The patch I believe > would be a fix to the freebsd-update client to better handle the tag. I > can't see mergemaster as being an easier solution, as the actual binary > would need to be verified against a known good index that would exist on the > update server. > > But then, again, I may be wrong.
You may well be right; I haven't investigated how the two calculate the differences. > > We had this discussion a month or two ago. > > Do you have a link to this thread? Thread title is: "Accidentally aborted upgrade via freebsd-update - how to recover?" Relevant discussion starts here, on Dec 27 2010: <http://lists.freebsd.org/pipermail/freebsd-stable/2010-December/060763.html> -- Clifton -- Clifton Royston -- [email protected] / [email protected] President - I and I Computing * http://www.iandicomputing.com/ Custom programming, network design, systems and network consulting services _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to "[email protected]"
