Date: Fri, 25 Feb 2011 10:00:19 -0800 From: jhelfman@e-e.com To: freebsd-stable@freebsd.org Subject: Re: 8.2/7.4-RELEASEs Announced... Message-ID: <20110225180019.GD76063@eggman.experts-exchange.com> In-Reply-To: <20110225160109.GA32260@lava.net> References: <4D66CCFF.9020903@buffalo.edu> <86zkpkwff5.fsf@brain.hack.org> <20110225134225.GB19190@tolstoy.tols.org> <20110225160109.GA32260@lava.net>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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. > We had this discussion a month or two ago. Do you have a link to this thread? > > Currently there is no way around verifying the changes for each file > with a changed $ID$ field, frustrating as it is. > > (Also, if you realize you've made a mistake and say "N" at the end > when it asks if all the merges are OK, it kicks you out of the update > process instead of going through the merges again.) > -- Clifton > > > -- > Clifton Royston -- cliftonr@iandicomputing.com / cliftonr@lava.net > President - I and I Computing * http://www.iandicomputing.com/ > Custom programming, network design, systems and network consulting > services > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110225180019.GD76063>