From: Alan Mackenzie <acm@muc.de>
To: gentoo-user@lists.gentoo.org
Subject: Re: [gentoo-user] Difficulty with updating /etc/basb/bashrc
Date: Fri, 14 Jun 2024 17:39:24 +0000 [thread overview]
Message-ID: <ZmyATIJTWK7KFybD@ACM> (raw)
In-Reply-To: <3a606519-d90c-4d7d-be97-ebbbd325042b@duncodin.org>
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).
next prev parent reply other threads:[~2024-06-14 17:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <IPhvk-2UIJ-3@gated-at.bofh.it>
2024-06-14 16:19 ` [gentoo-user] Difficulty with updating /etc/basb/bashrc Mike Civil
2024-06-14 17:39 ` Alan Mackenzie [this message]
2024-06-14 18:08 ` Waldo Lemmer
2024-06-15 17:14 ` Wol
2024-06-14 15:53 Alan Mackenzie
2024-06-14 16:22 ` netfab
2024-06-14 17:33 ` Alan Mackenzie
2024-06-14 17:47 ` netfab
2024-06-14 17:52 ` netfab
2024-06-15 19:52 ` Alan Mackenzie
2024-06-15 11:39 ` Peter Humphrey
2024-06-14 18:25 ` Vitaliy Perekhovy
2024-06-14 20:54 ` Jack
2024-06-15 6:38 ` Vitaliy Perekhovy
2024-06-15 22:00 ` Jack
2024-06-15 22:24 ` Peter Humphrey
2024-06-15 19:58 ` Alan Mackenzie
2024-06-14 23:43 ` Paul Colquhoun
2024-06-15 20:10 ` Alan Mackenzie
2024-06-17 7:25 ` Wols Lists
2024-06-15 16:39 ` Wol
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZmyATIJTWK7KFybD@ACM \
--to=acm@muc.de \
--cc=gentoo-user@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox