Thus spake Jason Thorpe
> So, in other words, if you have local changes, it _still_ requires human
> intervention (unless there's a really hot AI in there), it's still
> really no different than sup/"cvs import".

Here is how I handle this for both NetBSD and PostgreSQL.  I keep two
shadow source directories, src.original and src.changed.  Any modified
files (I use a wrapper around vi) have the original and changed versions
stored in these trees.  Every night I have cron sup everything then do
diffs on all the files in src.original against src.  If they are the same
it simply copies my changed one back in.  If different it mails me the
diffs.  That way I only have to deal with the issue when their is a
new change to a file that I have modified locally.  It's the simplest
way I could come up with.

-- 
D'Arcy J.M. Cain                           |  Democracy is three wolves
darcy@{druid.net|vex.net}                  |  and a sheep voting on         
+1 416 424 2871     (DoD#0082)    (eNTP)   |  what's for dinner.
                --  http://www.druid.net/darcy  --