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 CAD9115817D for ; Fri, 14 Jun 2024 17:39:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5201E2A14; Fri, 14 Jun 2024 17:39:27 +0000 (UTC) Received: from mail.muc.de (mail.muc.de [193.149.48.3]) (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 03E49E2A02 for ; Fri, 14 Jun 2024 17:39:26 +0000 (UTC) Received: (qmail 40584 invoked by uid 3782); 14 Jun 2024 19:39:25 +0200 Received: from muc.de (pd953a4fd.dip0.t-ipconnect.de [217.83.164.253]) (using STARTTLS) by colin.muc.de (tmda-ofmipd) with ESMTP; Fri, 14 Jun 2024 19:39:25 +0200 Received: (qmail 5392 invoked by uid 1000); 14 Jun 2024 17:39:24 -0000 Date: Fri, 14 Jun 2024 17:39:24 +0000 To: gentoo-user@lists.gentoo.org Subject: Re: [gentoo-user] Difficulty with updating /etc/basb/bashrc Message-ID: References: <3a606519-d90c-4d7d-be97-ebbbd325042b@duncodin.org> 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 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3a606519-d90c-4d7d-be97-ebbbd325042b@duncodin.org> X-Submission-Agent: TMDA/1.3.x (Ph3nix) From: Alan Mackenzie X-Primary-Address: acm@muc.de X-Archives-Salt: d0b6a806-ca93-4909-b169-246360fe0999 X-Archives-Hash: 1b6e55b895d58644b70e1c1935785257 Hello, Mike. On Fri, Jun 14, 2024 at 17:19:31 +0100, Mike Civil wrote: > On 14/06/2024 17:00, Alan Mackenzie wrote: > > Right now, I have a problem. Is there any convenient way I can get the > > older standard file contents back again, so as to be able to do this > > 3-way diff? > Does etc-update or dispatch-conf not give you the option to selectively > update and/or to diff the file? In theory, yes. In practice, dispatch-conf just offers a single ~130-line long hunk, which is useless for distinguishing wanted pieces of code from old superseded code. As I say, what's missing is the old repository version, which would allow a diff3. Maybe I should submit a feature request to Gentoo's bugzilla. > Going forward it might be better to put your custom changes in a file > under /etc/bash/bashrc.d which won't then get clobbered by portage. Or something like that, yes! -- Alan Mackenzie (Nuremberg, Germany).