1 |
Marc Joliet <marcec@×××.de> wrote: |
2 |
|
3 |
> Am Fri, 23 Jan 2015 21:30:07 -0500 |
4 |
> schrieb Rich Freeman <rich0@g.o>: |
5 |
> |
6 |
> > On Fri, Jan 23, 2015 at 7:12 PM, <covici@××××××××××.com> wrote: |
7 |
> > >> On Fri, Jan 23, 2015 at 5:45 PM, shawn wilson <ag4ve.us@×××××.com> wrote: |
8 |
> > >> > Is there a way to have default config lines that emerge updates won't touch? |
9 |
> > >> > |
10 |
> > >> |
11 |
> > >> I'd be interested in hearing about alternatives, but I switched to |
12 |
> > >> cfg-update from dispatch-conf and such because it does automatic 3-way |
13 |
> > >> merging. It is pretty good about detecting stuff that you customized |
14 |
> > >> and auto-merging those lines as long as the upstream file doesn't |
15 |
> > >> change. If it does, then you get a 3-way merge in meld or another |
16 |
> > >> tool to do the merge. 95% of the time it just automerges all config |
17 |
> > >> file updates without any interaction. |
18 |
> > >> |
19 |
> > >> I inherited maintaining this upstream, so feel free to submit |
20 |
> > >> improvements. It is a fairly mature tool but we've had some great |
21 |
> > >> contributions to keep it up-to-date with portage/paludis apis. |
22 |
> > > |
23 |
> > > I was using that, but it didn't do any automatic 3-way merge for me, I |
24 |
> > > do everything from a text console. I am now using etc-update which is |
25 |
> > > not too bad. |
26 |
> > |
27 |
> > I'd have to take another look, but I don't think the automatic merge |
28 |
> > works unless you're using a 3-way diff tool, and I think those are all |
29 |
> > X11. |
30 |
> |
31 |
> The man page to cfg-update says that it needs diff3 for the automatic three-way |
32 |
> merge (STAGE2), which is part of diffutils. Interestingly, cfg-update does not |
33 |
> depend on diffutils, so maybe you (Covici) just need to install it? |
34 |
> |
35 |
> And for manual three-way merges (STAGE3) there are, at the very least, Vim and |
36 |
> Emacs. |
37 |
|
38 |
I found that cfg-update rarely did its automatic merge (I do have |
39 |
diffutils) and so there was nothing to be gained between cfg-update and |
40 |
etc-update which seemed better as long as you were not relying on |
41 |
automatic merge. It seemed to only do it on comments, but I can't say |
42 |
that was always true. |
43 |
|
44 |
-- |
45 |
Your life is like a penny. You're going to lose it. The question is: |
46 |
How do |
47 |
you spend it? |
48 |
|
49 |
John Covici |
50 |
covici@××××××××××.com |