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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 71648158020 for ; Wed, 26 Oct 2022 23:55:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75A64E0A5A; Wed, 26 Oct 2022 23:55:44 +0000 (UTC) Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D94DE09C0 for ; Wed, 26 Oct 2022 23:55:44 +0000 (UTC) Received: by mail-yb1-f177.google.com with SMTP id 187so12097032ybe.1 for ; Wed, 26 Oct 2022 16:55:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tP/68No0B3W8tsrjmKtqKgF2mlTKL/w/NItO5PymRtQ=; b=wYy31wubaYfyQkk4jEGgoZcWs1ZUg1gusicESau9+S5knWZ1FQGTIp87ywnVnGsYMo 5bmwBIe+/GYeAWn9JDrkFdUs7oOwuOBoZhkpHDxkghuf7qfamyrdkR7wcsVN67fap6Bo iNckxCfNXXsnY0gUKqnoE207/Y1tGtZBmszKYnlNE2u32hluXdj0YA1OTm1V8mWQwgPN K8jVQ7L1xEkb+CwFJMkFlWgoluAX/fX0+Qvr+rLqOsZq05r+xs3rnFCMKS3jcOFcCWme KioC0OTYO+0+EZLIZbuAePFuUyHMlDYILMeTU5J3Gr0sMoK0+aNqxS9T2aQlV/5FUszA lqXw== X-Gm-Message-State: ACrzQf3I9p6h6YufW8yLJcEgpywUl/v586wQqkgnynqKZQqbC/8yph6V sU3RsVEDpVHCDBsQlTyCon/kgt/ng9+BTW9dEOlcsXraQQo= X-Google-Smtp-Source: AMsMyM5lZ6S8zpOzkEKoLYpAO7eU4SfBA2mwvOVd5Xm+rJUr7o6KPgS7BQEQrAnxRho0Dnik1YZOLqH5wqcSB+8v+4Q= X-Received: by 2002:a25:84cc:0:b0:6c4:95:f1c1 with SMTP id x12-20020a2584cc000000b006c40095f1c1mr44401222ybm.131.1666828543202; Wed, 26 Oct 2022 16:55:43 -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 X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 References: <7b461fc5-25fa-f07b-aedf-ea538c424bb5@spamtrap.tnetconsulting.net> <84d6e3ed-2bd8-720b-b158-eb2cd534fe39@spamtrap.tnetconsulting.net> <20221026181520.537b7104@digimed.co.uk> In-Reply-To: From: Rich Freeman Date: Wed, 26 Oct 2022 19:55:32 -0400 Message-ID: Subject: Re: [gentoo-user] Re: Update to /etc/sudoers disables wheel users!!! To: gentoo-user@lists.gentoo.org Content-Type: text/plain; charset="UTF-8" X-Archives-Salt: 77ad4b0f-4f50-453c-badb-53e8de4a8954 X-Archives-Hash: 54f50b35d2a2ee96855c394f240e63cc On Wed, Oct 26, 2022 at 5:26 PM Grant Edwards wrote: > > On 2022-10-26, Dale wrote: > > Rich Freeman wrote: > >> If you use an x11-based merge tool then it will also refuse to attempt > >> an automatic > >> merge if X11 isn't available. (Obviously you can't actually run the > >> manual merge if the tool uses X11 and that isn't available.) > >> > >> > > > > I'd like to try a GUI based tool. Is that what you talking about? If > > so, name or what package has it? > > At one point, I had one of my systems configured to use "meld" when I > picked "interactive merge" in the etc-update menu, but I've since gone > back to just picking "show differences" in the etc-update menu, then > manually running merge on the two filenames shown. With the > interactive merge option, I was always a bit confused about which file > was the destination and what happened after I exited meld. > I use cfg-update+meld. It can use any 3-way diff/edit tool, but there aren't many of those. I believe the three panels show: Left: the current config file Right: new new packaged config file Center: what the packaged config file was the last time you did an update So Left vs Center shows you what changes you've made vs upstream, and center vs right show you what changes upstream made to their file. So you would look for differences on the right side to see what needs attention in the file, and then work those changes if appropriate into the left file. You just edit the left file to get it the way you want it and save that, and then cfg-update captures the changes in RCS. -- Rich