On Sun, 3 Aug 2003 14:33:58 +1200, in gmane.linux.gentoo.user, David
Friggens <[EMAIL PROTECTED]> wrote:
>[...etc-update...]
>
>> This is IMO the most very frustrating part of the way Gentoo works.
50*ACK :->
>[......]
>
>I've always found it more than satisfactory. etc-update automatically
>merges any trivial changes and then I use the interactive merge option
>(3, I think) to make sure my settings don't get overridden.
How do I recognize "trivial" changes? Only upt to 3 lines affected?
Then there are no trivial changes;-)
>[......]
>
>(*) Select the number of the file
The selection list is very often too long to fit on a screen; the
beginning of the list is rolled off the screen - not very clean.
>(*) Select "3) Interactively merge original with update"
>(*) Update diff-by-diff how you like
> Admittedly this bit is the most unintuitive at first as it doesn't
> tell you what the options are. But if you type "?" it gives you the
> list:
> ed: Edit then use both versions, each decorated with a header.
> eb: Edit then use both versions.
> el: Edit then use the left version.
> er: Edit then use the right version.
> e: Edit a new version.
> l: Use the left version.
> r: Use the right version.
> s: Silently include common lines.
> v: Verbosely include common lines.
> q: Quit.
> Usually a mix of "r" and "l" is all that's needed.
Quite often I get confused which side is old (left?) and new,
respectively. Also I lose track of the logical context, so I would
have to trust the "mechanics" of sdiff _blindly_ - well, I don't!
I copy the ._cfg-file to <config>.new and edit that manually (I
re-inject my modifications).
BTW, I don't understand the options beginning with 'e' (edit
[then...]).
Maybe it would be easier & safer with vim-diff (seeing everything in
context), but I would have to learn vim in the first place :-)
Best regards,
-Heribert
--
Heribert Slama
Muttenz, Switzerland
--
[EMAIL PROTECTED] mailing list
