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 AAF0415817D for ; Sat, 15 Jun 2024 20:11:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 623E6E2BC1; Sat, 15 Jun 2024 20:10:55 +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 A97DFE2BAA for ; Sat, 15 Jun 2024 20:10:54 +0000 (UTC) Received: (qmail 96718 invoked by uid 3782); 15 Jun 2024 22:10:53 +0200 Received: from muc.de (pd953a943.dip0.t-ipconnect.de [217.83.169.67]) (using STARTTLS) by colin.muc.de (tmda-ofmipd) with ESMTP; Sat, 15 Jun 2024 22:10:53 +0200 Received: (qmail 21038 invoked by uid 1000); 15 Jun 2024 20:10:52 -0000 Date: Sat, 15 Jun 2024 20:10:52 +0000 To: gentoo-user@lists.gentoo.org Subject: Re: [gentoo-user] Difficulty with updating /etc/basb/bashrc Message-ID: References: <4897976.GXAFRqVoOG@w540.andor.dropbear.id.au> 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: <4897976.GXAFRqVoOG@w540.andor.dropbear.id.au> X-Submission-Agent: TMDA/1.3.x (Ph3nix) From: Alan Mackenzie X-Primary-Address: acm@muc.de X-Archives-Salt: 00e17853-eb1a-4322-a88b-3124b9188d08 X-Archives-Hash: 6bbeaa99d85ece19d7effe315cf6c12e Hello, Paul. On Sat, Jun 15, 2024 at 09:43:22 +1000, Paul Colquhoun wrote: > On Saturday, June 15, 2024 1:53:35 A.M. AEST Alan Mackenzie wrote: > > Hello, Gentoo. > > My main problem is that I don't know which parts of the existing bashrc > > are my changes (which I'd want to keep) and which parts were the standard > > bashrc (which I can allow to be superseded by the new version). > > I think portage is at fault here - it should retain the older standard > > version of /etc/bash/bashrc so that users can resolve the differences > > with a 3-way diff. > You edited the old file, not portage. > Why didn't you keep a copy of the old file? Because that's one of the itsy-bitsy routine things that ought to be automatic, not something that each user should have to think out for himself. It turns out I actually had the old file in /etc/config-archive all along. It's a shame dispatch-conf and friends don't do an automatic 3-way merge. This would make things so much simpler and less stressful. > On the other hand, a quick "locate bashrc" says that my system has some old > versions stored away at: > /var/db/repos/gentoo/app-shells/bash/files For some reason, I don't actually have that directory. > -- > Reverend Paul Colquhoun, ULC. http://andor.dropbear.id.au/ > Asking for technical help in newsgroups? Read this first: > http://catb.org/~esr/faqs/smart-questions.html#intro -- Alan Mackenzie (Nuremberg, Germany).