When diagnosing a problem on one of the slave build machines I manually edited
one of the files associated with our build to try and work out what was going wrong.

After tracking down the problem I forgot to revert the changes I made. The same
file was then editing by another user and checked in to the svn repository
resulting in a conflict when Hudson tried to update the code in the workspace.

It is possible with the more recent versions of svn it is possible to do:

svn update --accept theirs-full

which ensures that any conflicts result in the svn repository version of the
file being used by preference.

It would be really useful to have this as an option, and possibly also the
--force option when Hudson is doing updates as the build machine should mirror
the repository.

Hudson could be set to do a full checkout each time but that is much slower than
simply updating the files required, this would make the update process more
reliable.