From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E693E138334 for ; Mon, 18 Jun 2018 15:34:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3052DE0951; Mon, 18 Jun 2018 15:34:49 +0000 (UTC) Received: from mail-pf0-f176.google.com (mail-pf0-f176.google.com [209.85.192.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7CA2AE0907 for ; Mon, 18 Jun 2018 15:34:48 +0000 (UTC) Received: by mail-pf0-f176.google.com with SMTP id y5-v6so8357990pfn.4 for ; Mon, 18 Jun 2018 08:34:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=Do3bwxa/Xm6cx8ecM4JXX0ERe6xju5KwGbxZAfWna70=; b=tMuhh6qxws10JGo1wE3uDTrnE/LPS3c7L1qxcwy4OQUe9R+xNezpEwLKguGeLlVWN3 e+v73JBumIq6FHhm6SFkRQ40GoMyF2a2gYdxrSQ4gDKATwPl69wuWIUElt793+i/Nqeu JilofVk9WJYygGevxTIOWKeKJMIKGvLT4xSw36B6CSr530r9S2PtKgvRsbK7oN2IyDla 870vndFcKHj5DKMdD8Kowp823cLg5R5MmkgOMI1RClq1X77EcG9s0LtpKcboeF58Bkpd T8V9QRF7zWcb01uynhAJnf4QwGYZFry66+tBLvG8038F5ORaxgBiMoOiMABCO6E08E4T nkoQ== X-Gm-Message-State: APt69E0nW3TtWpBrGSkTTNK7dNe02SvRx6ArSz2krkE6dolegYwNxFrZ MSi6VsAkBkmz3QOkcRIGeItYMRhshjOJoYEIPjayPA== X-Google-Smtp-Source: ADUXVKKaBwB8iyx6BU8oOxYyyKSZIbkmFxFSx6IVrWICjQngIK19JgW2AbmHlagqc/d58pZmSTrflUAT/8/EWjeLM1Y= X-Received: by 2002:a65:6612:: with SMTP id w18-v6mr11268749pgv.38.1529336087114; Mon, 18 Jun 2018 08:34:47 -0700 (PDT) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-user@lists.gentoo.org Reply-to: gentoo-user@lists.gentoo.org MIME-Version: 1.0 References: <20180617161734.3caolj55axlrvj7e@matica.foolinux.mooo.com> <92005d3d-be02-7105-8513-3fda7a5511dc@gmail.com> <20180617170848.dby2dji7mws5oimv@matica.foolinux.mooo.com> <3193940.MfF64nHGbz@dell_xps> <20180618023505.gi2wmq3hvcdkf6cm@matica.foolinux.mooo.com> <20180618082750.02eb07a9@digimed.co.uk> In-Reply-To: <20180618082750.02eb07a9@digimed.co.uk> From: Rich Freeman Date: Mon, 18 Jun 2018 11:34:35 -0400 Message-ID: Subject: Re: [gentoo-user] Re: default CONFIG_PROTECT behavior To: gentoo-user@lists.gentoo.org Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: f7544b15-9242-434f-b112-2ff4d0aad204 X-Archives-Hash: 53bb770f1e25d839c5b4d42197484099 On Mon, Jun 18, 2018 at 3:27 AM Neil Bothwick wrote: > > There are other config managers that handle this differently, if you > don't like etc-update try another. I tried a few some years ago and > settled on conf-update, others swear by cfg-update. Since nobody else is shilling it, I will. I don't think I could stand Gentoo without cfg-update. When I run Arch in a container it makes me want to port it (maybe Arch has a similar solution - I don't use it enough to know). With the automatic 3-way merges 95% of the time I don't even look at config file changes. If the parts of the files I've customized haven't changed, then the diff gets re-applied. Once in a while I get a merge conflict and then meld pops up showing me a 3-way diff. I'll admit that it has a few issues. One is that it isn't obvious how to handle manual 3-way merges. The right version is the new upstream file. The left version is your current file. The middle is the previous upstream file, so the diffs on the left show what you changed before, and the diffs on the right show what upstream changed. Chances are you'll want to pass through some of those, so just hit all the merge-to-left buttons on those. I usually just save the new file and don't touch the previous two, so that cfg-update correctly saves the original upstream file for re-use. However, perhaps I should be saving a new middle version merged with the upstream. I haven't confirmed exactly how it behaves. Upstream is largely dead on cfg-update, and I'm basically nursing it along since I can't live without it. Feel free to give it a shot. In the beginning it won't be much better than dispatch-conf, until it builds up its library of past changes. Oh, the other tool you'll want to use is etckeeper to manage /etc in a git repo and auto-commit changes/etc with package manager hooks. That is a cross-distro tool, and will save your butt if you mess something up. -- Rich