I've checked in dependency history files in rev 686287. If you've
updated trunk and built since yesterday you may need to delete locally
generated dependency history files before running svn up in order to
avoid conflicts.
find . -name history | xargs rm -rf
should do the trick.
cf GERONIMO-4248
thanks
david jencks