Date: Thu, 15 Jun 2023 19:41:20 -0700 From: bob prohaska <fbsd@www.zefox.net> To: Current FreeBSD <freebsd-current@freebsd.org> Cc: bob prohaska <fbsd@www.zefox.net> Subject: Re: Using etcupdate resolve, was Re: Surprise null root password Message-ID: <ZIvL0GJx1xvZmSmH@www.zefox.net> In-Reply-To: <D3835849-D491-4711-810B-7CE96789AEA6@hausen.com> References: <8721FE04-3769-473C-BAAD-EB0A4FCFA1D7.ref@yahoo.com> <8721FE04-3769-473C-BAAD-EB0A4FCFA1D7@yahoo.com> <ZHalP9BhpSiKvDmb@www.zefox.net> <C221AC0B-7DF3-4FC2-BE9F-BC136BEC4B9A@yahoo.com> <ZItJ2GFmBhFgA2Uy@www.zefox.net> <D3835849-D491-4711-810B-7CE96789AEA6@hausen.com>
next in thread | previous in thread | raw e-mail | index | archive | help
I want to thank Patrick, Dmitry and Mark for providing orientation sufficient to make some headway. The Handbook simply says "If etcupdate(8) is not able to merge a file automatically, the merge conflicts can be resolved with manual interaction by issuing: # etcupdate resolve While not wrong, it's certainly less than the whole story 8-) It's unfortunate that the example posted was a trivial case, certainly I didn't tamper with BSD.tests.dist and tf was the correct response. If I'm understanding correctly, the file presented by the df and e options contains essentially all possible versions, delimited by <<<<<<<<<<<<<, ||||||||||| and >>>>>>>>> characters. Once edited, that will become the new local version of the file. If this is mistaken please say so. bob prohaska
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ZIvL0GJx1xvZmSmH>