Date: Wed, 8 Dec 2021 13:33:31 -0800 From: Yetoo Happy <yetoohappy@gmail.com> To: John Baldwin <jhb@freebsd.org> Cc: Miroslav Lachman <000.fbsd@quip.cz>, freebsd-doc@freebsd.org, freebsd-current@freebsd.org Subject: Re: Make etcupdate bootstrap requirement due to previous mergemaster usage more clear in handbook Message-ID: <CALT2f4v3AsmTpbe-UJYAutN-CXhtBC2CSiHbosQ8Oa1NWxdf4w@mail.gmail.com> In-Reply-To: <2e894793-f860-3415-1f5d-26fd5e85a69d@FreeBSD.org> References: <CALT2f4tzUw_-LZ7kwa8m=iRQFshNKDxM3DAcLjPw3eN8OZBthQ@mail.gmail.com> <56a60a9b-3d7f-b29e-6074-71078f4b0fe6@quip.cz> <2e894793-f860-3415-1f5d-26fd5e85a69d@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000b4361105d2a93e92 Content-Type: text/plain; charset="UTF-8" If it was in a temporary directory, even if I manaually resolved the file and merge, I was expecting that file marked as resolve to stay in that temporary directory until I was done with all my files. Maybe I'm confusing mergemaster -Ui behavior with something else, but it seems like only merging after the user has reviewed all manual changes in a final verification sweep is common sense or at least explicitly display the tree directory that would be written to and say this is final change. I didn't know that each file etcupdate went over was going to be the final review. I think my system broke by the time I got to the rest of the postponed items due to this. On Wed, Dec 8, 2021, 9:05 AM John Baldwin <jhb@freebsd.org> wrote: > 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 > --000000000000b4361105d2a93e92--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CALT2f4v3AsmTpbe-UJYAutN-CXhtBC2CSiHbosQ8Oa1NWxdf4w>