Edward Catmur wrote:
After an "emerge -e" runned as usually dispatch-conf , but keyboard in
xorg stopped working.
discovered that this happen because dispatch-conf ( rcs ) doesn't handle
very well binary files.
First, in /etc/dispatch-conf.conf make sure this line does NOT have "-a"
in it.
# Diff for display
diff="diff -Nu %s %s"
/etc/dispatch-conf.conf is modified but no "-a"
use-rcs=yes
diff="clear; diff -Nu %s %s"
pager="less --no-init"
Then, when you are prompted for e.g. xkbcomp, press 't' (toggle-merge)
to switch from the ._mrg_00001 version to the ._cfg_00001 version, which
is the proper new version without the >>>>>>> lines.
ok
You get used to it after a while, but I don't know why it hasn't been
fixed - trying to merge two binary files is just silly.
Ed Catmur
Thanks
--
[email protected] mailing list
