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. -- Rich
