Date: Wed, 8 Dec 2021 09:05:17 -0800 From: John Baldwin <jhb@FreeBSD.org> To: Miroslav Lachman <000.fbsd@quip.cz>, Yetoo Happy <yetoohappy@gmail.com>, freebsd-doc@freebsd.org Cc: freebsd-current@freebsd.org Subject: Re: Make etcupdate bootstrap requirement due to previous mergemaster usage more clear in handbook Message-ID: <2e894793-f860-3415-1f5d-26fd5e85a69d@FreeBSD.org> In-Reply-To: <56a60a9b-3d7f-b29e-6074-71078f4b0fe6@quip.cz> References: <CALT2f4tzUw_-LZ7kwa8m=iRQFshNKDxM3DAcLjPw3eN8OZBthQ@mail.gmail.com> <56a60a9b-3d7f-b29e-6074-71078f4b0fe6@quip.cz>
next in thread | previous in thread | raw e-mail | index | archive | help
On 12/3/21 4:58 AM, Miroslav Lachman wrote: > So beside the update of documentation I really would like to see some > changes to etcupdate workflow where files are modified in temporary > location and moved to destination only if they do not contain any syntax > breaking changes like <<<<, ====, >>>>. This is what etcupdate does, so I'm a bit confused why you are getting merge markers in /etc. When an automated 3-way merge doesn't work due to conflicts, the file with the conflicts is saved in /var/db/etcupdate/conflicts/<path>. It is only copied to /etc when you mark it as fully resolved when running 'etcupdate resolve'. Perhaps you had multiple conflicts in a modified file and when editing the file you only fixed the first one and then marked it as resolved at the prompt? Even in that case etcupdate explicitly prompts you a second time after you say "r" with "File <foo> still has conflicts, are you sure?", so it will only install a file to /etc with those changes if you have explicitly confirmed you want it. -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2e894793-f860-3415-1f5d-26fd5e85a69d>