Grant wrote:
I've been emerging world today and I think one of the packages I
updated was a diff package.  Now when I run etc-update the only info I
get from choosing to interactively merge the update with the original
is something like:

Showing differences between /etc/X11/rstart/rstartd.real and
/etc/X11/rstart/._cfg0000_rstartd.real
Files /etc/X11/rstart/rstartd.real and
/etc/X11/rstart/._cfg0000_rstartd.real differ

Does anyone know how to fix this?

You don't need to fix it because it isn't broken. That file is binary so diff can't show you the differences.

Cheers,
Renat


Thanks, all auto-merged.

- Grant

Ok but don't do automerge ("-5" if I remember well) as "default" merge always the binary files but also have a look at the others.


An execepition many people do is the files in /etc/init.d/ , to let etc-update handle files in that dir set your CONFIG_PROTECT_MASK="/etc/init.d/"

--
No problem is so formidable that you can't walk away from it.
~ Charles M. Schulz
But sometimes run fast is better
~ Francesco R.
--
[email protected] mailing list



Reply via email to