common tobuild,1.345,1.346

[Bill Nottingham]

Michael Schwendt (bugs.michael at gmx.net) said: 
> Yeah, because the "rm -f tobuild" added recently was not a good idea
> (it should just attempt to cvs up, but never remove the local file).
> Just restore the dropped entries.

The idea is that blindly doing cvs up and then adding a line isn't
good either; you'll get conflicts.

Probably it should just error out more.

Bill