Re: [gentoo-user] emerge default config

[Marc Joliet]

Am Fri, 23 Jan 2015 21:30:07 -0500
schrieb Rich Freeman <rich0@g.o>:

> On Fri, Jan 23, 2015 at 7:12 PM,  <covici@××××××××××.com> wrote:
> >> On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson <ag4ve.us@×××××.com> wrote:
> >> > Is there a way to have default config lines that emerge updates won't touch?
> >> >
> >>
> >> I'd be interested in hearing about alternatives, but I switched to
> >> cfg-update from dispatch-conf and such because it does automatic 3-way
> >> merging.  It is pretty good about detecting stuff that you customized
> >> and auto-merging those lines as long as the upstream file doesn't
> >> change.  If it does, then you get a 3-way merge in meld or another
> >> tool to do the merge.  95% of the time it just automerges all config
> >> file updates without any interaction.
> >>
> >> I inherited maintaining this upstream, so feel free to submit
> >> improvements.  It is a fairly mature tool but we've had some great
> >> contributions to keep it up-to-date with portage/paludis apis.
> >
> > I was using that, but it didn't do any automatic 3-way merge for me, I
> > do everything from a text console.  I am now using etc-update which is
> > not too bad.
>
> I'd have to take another look, but I don't think the automatic merge
> works unless you're using a 3-way diff tool, and I think those are all
> X11.

The man page to cfg-update says that it needs diff3 for the automatic three-way
merge (STAGE2), which is part of diffutils.  Interestingly, cfg-update does not
depend on diffutils, so maybe you (Covici) just need to install it?

And for manual three-way merges (STAGE3) there are, at the very least, Vim and
Emacs.

-- 
Marc Joliet
--
"People who think they know everything really annoy those of us who know we
don't" - Bjarne Stroustrup