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 04A8D15802E for ; Fri, 28 Jun 2024 06:11:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4950CE2A86; Fri, 28 Jun 2024 06:11:15 +0000 (UTC) Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) (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 A71E9E2A4B for ; Fri, 28 Jun 2024 06:11:14 +0000 (UTC) Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-2598abc6848so156950fac.0 for ; Thu, 27 Jun 2024 23:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719555074; x=1720159874; darn=lists.gentoo.org; h=content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:autocrypt:from:references:to:subject:from:to:cc:subject :date:message-id:reply-to; bh=hJu0MbZJ3zMsYlJcwe6qd2lKVacLqlMN2kz5aZo7sNg=; b=aCAkFHuBPUm0GIij4bPThG5I8vwLFayjV1WITPopUpq7O8C/YNPK343DEJIBibSl1C DDRJVuWXNsagkGhfq8G+dDl0tKsBya8YWFGuAc0bTffjn3Ec5e4wqwfGepVXb1T5+15h o3pZL3i9LwsBQsTWw2ebn20n7j7T4lTr6mpWPItmOhGFvQxXrgi7at3jhV0aUfNrLyMZ hqQDTDT5IxFktSRmlbTkiKT904faAhM8BuqbLx20WBaVQfT6ME7qZgBhWkUmKnnw/kwi u8ynAiTSWKSjWSYf6fJuFE5CHrxuX7rWYeWbuCFmPh1Cto4loc13p31cRZwp1B3ZVmAG zAeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719555074; x=1720159874; h=content-transfer-encoding:in-reply-to:mime-version:user-agent:date :message-id:autocrypt:from:references:to:subject:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=hJu0MbZJ3zMsYlJcwe6qd2lKVacLqlMN2kz5aZo7sNg=; b=UX91CNeB2jeaVFx/sop5L31pXmbT3HtdiEiH3pgHsjDnLSVJdC58eEGE5jejcZfTZM 2TX7wWEiGaaKvqdmpF6isQhFCX1C2Z0LCDU6CGTLVDBUVyrQGeRFBeLmM4m67MNUNrPV ENB1IPvMNQDDRdBBZRYmV76dvWJI7SgvgOUi4IDycGz7X0gMmP7SGo7WQGdjRzZePUqD mzydcqJICTBTvpEjresXNPmY/kYY9yjQwAaBf8O1uK0w33pTP4xn5O0mW88qbqQRvrlk /N8T7W+8MU9vsJe2JIG6FdqxWC0XLBvax8Krt3NUsZ6YLW+XEqaKQ7Z/fv4KEuWcaUCv PyCg== X-Gm-Message-State: AOJu0YwqeMmweax8XwxYiAG6hS4wnz0zHTpT4Uescc8cuzycWoDxfmeo DXAjHU+F8KF7vPYm/fgMljiTezpW608mlLDq791meeoCQTXBGOkI X-Google-Smtp-Source: AGHT+IExPenGf00YJrh00C5EblS2nYFI5PgvJnxcusx1inpnRzc4/JlBD5lPMK9pip3dm0nDT4zWtg== X-Received: by 2002:a05:6870:65ab:b0:258:32c5:ebc4 with SMTP id 586e51a60fabf-25d97271df7mr278679fac.26.1719555073796; Thu, 27 Jun 2024 23:11:13 -0700 (PDT) Received: from [10.8.8.16] ([37.19.221.89]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-701f7b3984bsm207042a34.78.2024.06.27.23.11.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 27 Jun 2024 23:11:13 -0700 (PDT) Subject: Re: [gentoo-user] Re: Config file updates and using diff. To: gentoo-user@lists.gentoo.org References: <7e4de43a-f3c8-a01c-1403-512e7c05562b@gmail.com> From: Dale Autocrypt: addr=rdalek1967@gmail.com; prefer-encrypt=mutual; keydata= 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 Message-ID: <70697344-a49f-2ae4-1f5e-a75b364de687@gmail.com> Date: Fri, 28 Jun 2024 01:11:12 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Firefox/91.0 SeaMonkey/2.53.18.2 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 In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: b5793e3d-5c04-4f6b-8323-771d171f7946 X-Archives-Hash: 19b04ee69799050d173a69107ac57270 Grant Edwards wrote: > On 2024-06-27, Dale wrote: >> Howdy, >> >> I just finished a large update on my main rig.  I have a lot of config >> files to update and some have new entries that are needed but I don't >> want to lose the ones I've already set.  Usually, I just pick the new >> one and have a saved copy of the old config to put back my settings.  >> This is a lot of config files tho.  I been using dispatch-conf for this >> but I've never figured out how to use the diff feature and tell it which >> parts I want to keep and what I want to update.  >> >> First, I've looked on the wiki and can't find a howto on using the diff >> tool.  Is there a guide on there I can't find?  Second, is there a >> better way to do this, a very easy way if you will?  Like maybe a GUI >> thing where I use the mouse to select.  It would be nice if it is >> something I can easily remember how to do given how rare it is I need to >> do a diff of the files.  > I used the "meld" utility for doing visual side-by side diffs and > resolving merges. At one point, I had figured out how to get > etc-udpate to invoke meld for me, but I've lost that setting somehow. > > I usually just use etc-udpate, and then individually invoke meld with > the two file paths shown by etc-udpate. I merge the relevent bits of > the new default config file into my existing one using meld, then I > tell etc-udpate to "discard the new file" (or whatever that option > is). > I tried several different things, even those outside of emerge like kdiff3.  I couldn't figure out how to use any of them.  Eventually, I just hit 'use new' on them all.  Now I'm trying to fix everything it messed up.  Most everything works except for the bashrc.d stuff.  It seems things started moving from a single file to a directory with different files for different things.  I kinda like the idea myself. I just wish I could get it to work right.  LOL  Thanks for the suggestion.  Dale :-)  :-)