| 1 |
On Sun, Jan 25, 2015 at 9:57 AM, <covici@××××××××××.com> wrote: |
| 2 |
> Marc Joliet <marcec@×××.de> wrote: |
| 3 |
>> |
| 4 |
>> The man page to cfg-update says that it needs diff3 for the automatic three-way |
| 5 |
>> merge (STAGE2), which is part of diffutils. Interestingly, cfg-update does not |
| 6 |
>> depend on diffutils, so maybe you (Covici) just need to install it? |
| 7 |
>> |
| 8 |
>> And for manual three-way merges (STAGE3) there are, at the very least, Vim and |
| 9 |
>> Emacs. |
| 10 |
> |
| 11 |
> I found that cfg-update rarely did its automatic merge (I do have |
| 12 |
> diffutils) and so there was nothing to be gained between cfg-update and |
| 13 |
> etc-update which seemed better as long as you were not relying on |
| 14 |
> automatic merge. It seemed to only do it on comments, but I can't say |
| 15 |
> that was always true. |
| 16 |
> |
| 17 |
|
| 18 |
This might be as simple as a missing dependency. I'd be interested in |
| 19 |
more testing feedback in this area, and I might set up a container to |
| 20 |
test this more myself. |
| 21 |
|
| 22 |
I find that cfg-update correctly auto-merges config files probably 95% |
| 23 |
of the time. I'd happily keep it in portage if I were the only person |
| 24 |
using it as a result. :) However, if there are bugs preventing use by |
| 25 |
others they ought to be fixed. |
| 26 |
|
| 27 |
-- |
| 28 |
Rich |
Archives