Closer looking showed that these files had already been updated with cvs clashes. I've reset them to the local cvs.
Thanks, Hen On Mon, 17 Nov 2003, Dirk Verbeeck wrote: > Local changes to dbcp.html and pool.html can be removed. > The cvs version is correct. > > -- Dirk > > Henri Yandell wrote: > > There are some problems on the Commons site cvs-wise at the moment. > > > > dbcp.html and pool.html have been edited locally. > > httpclient/ has also been edited locally. > > > > These will get merges when we do a cvs update to get the latest version of > > Lang out [as the url of the lang page is changing]. Not in itself a > > problem, but a potential one. > > > > More painfully, the Latka site has also been updated locally and has cvs > > clashes. If we do an update for Lang we're going to cause big problems > > here. > > > > DBCP, Pool, HttpClient could all just copy the files on minotaur over to a > > cvs repository that is not checked out as anonymous and commit them there. > > Latka needs more juggling. > > > > Any thoughts? > > > > Hen > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
