On Fri, Jan 23, 2015 at 7:12 PM, <cov...@ccs.covici.com> wrote: >> On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson <ag4ve...@gmail.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. That doesn't make sense to me - the automatic part at least should be attempted with only a 2-way tool. I need to see if there is anything I can do about that. Also, if you haven't used it in the last year or two try it again. When I took it over we had a flurry of patches which fixed a bunch of little things with it, but it has been quiet for a while. -- Rich
