Actually, I pull -s the new file,
idiff `{yesterday file} file >NEW
Once I'm convinced that NEW is a correct merger,
cp NEW file
It's a tiny amount of work.
--- Begin Message ---
> Note also that keeping a customized version of the kernel source locally is
> completely unacceptable.
You keep saying that, but that doesn't make it true.
It's actually very common for people to keep customized
versions of source in /sys/src. When you pull, if one of
those files is new then you have to diff it and make the
changes by hand, then run pull -c to tell replica that
you've taken care of that. It's not hard.
Russ
--- End Message ---
