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 D527215817D for ; Fri, 14 Jun 2024 16:22:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F5A8E2AAB; Fri, 14 Jun 2024 16:22:21 +0000 (UTC) Received: from mailo.com (msg-2.mailo.com [213.182.54.12]) (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 D850AE2A65 for ; Fri, 14 Jun 2024 16:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=netc.eu; s=mailo; t=1718382136; bh=LYKYxaOeLNj2IjFYkd2CzLywNFWm3l6Wdfn1mglBnlU=; h=X-EA-Auth:Date:From:To:Subject:Message-ID:In-Reply-To:References: X-Mailer:MIME-Version:Content-Type:Content-Transfer-Encoding; b=Q0fCBdGVsZQ1jZxy/XAsbysBV1JFHDNCKmKNNNk+D2veDSjSRrflyLNknwWOc4aS3 aJkG0TtQ0666V27uxkA6kNd7CHN5zvLY1j5i3xAbJPpZkzeGhaq3PxB0E6X6vLNhwr 7WeMaMN+gQ3BznUbclNykXPYSLc+w+X0LqO1mCcA= Received: by b221-5.in.mailobj.net [192.168.90.25] with ESMTP via ip-20.mailobj.net [213.182.54.20] Fri, 14 Jun 2024 18:22:16 +0200 (CEST) X-EA-Auth: B0XOalziHpx/fYoeaI6CUoRfF01O8KMLcwXCe6YdziBx0AX7kD9PWWeUkBZMugqfNF0g2un6ytQW6Be9kAYA7H/ShBNy/RkO Date: Fri, 14 Jun 2024 18:22:11 +0200 From: netfab To: gentoo-user@lists.gentoo.org Subject: Re: [gentoo-user] Difficulty with updating /etc/basb/bashrc Message-ID: <20240614182211.5f93fe57@coreI5.home> In-Reply-To: References: X-Mailer: Claws Mail 4.1.1 (GTK 3.24.41; x86_64-pc-linux-gnu) 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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e2724d07-1f42-4180-8f30-5303aa90ca53 X-Archives-Hash: d4b3636a5022af27716d07b18cd8f5f7 Le 14/06/24 =C3=A0 17:53, Alan Mackenzie a tapot=C3=A9 : > 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? The old bashrc file installed by previous versions of the ebuild : https://github.com/gentoo/gentoo/blob/master/app-shells/bash/files/bashrc The new bashrc file : https://github.com/gentoo/gentoo/blob/master/app-shells/bash/files/bashrc-= r1