Re: Seeking an idiot's guide to etcupdate/mergemaster

2022-11-06 Thread Graham Perrin
etcupdate = On 06/11/2022 17:35, George Michaelson wrote: I am probably alone in this You're not alone. … I find the … markers in the update diffs intensely confusing. diff3 bracketing. <<< is where a conflict begins, >>> is where it ends. Beyond that, it was d

Re: Seeking an idiot's guide to etcupdate/mergemaster

2022-11-06 Thread George Michaelson
I am probably alone in this but I find the CVS style markers in the update diffs intensely confusing. Given many merges are large blocks, its almost impossible to keep context flitting about in vi to find the old/new insertions. The odd thing is that post edit, the view you get afterward i

Re: Seeking an idiot's guide to etcupdate/mergemaster

2022-11-06 Thread Tomoaki AOKI
On Sat, 5 Nov 2022 20:12:04 -0700 bob prohaska wrote: > On Mon, Oct 24, 2022 at 08:32:17PM -0700, Mark Millard wrote: > > > > Your /etc/rc.d/ldconfig script seems to have not been updated > > by use of etcupdate or mergemaster or other such. (How much > > else is also out of date? How much of wh

RE: Seeking an idiot's guide to etcupdate/mergemaster

2022-11-06 Thread Mark Millard
bob prohaska wrote on Date: Sun, 06 Nov 2022 03:12:04 UTC : > On Mon, Oct 24, 2022 at 08:32:17PM -0700, Mark Millard wrote: > > > > Your /etc/rc.d/ldconfig script seems to have not been updated > > by use of etcupdate or mergemaster or other such. (How much > > else is also out of date? How mu