You have conflicts, because I applied your patches but needed to change some things.
Best way is make a backup of this files, move them to a backup dir and update your forrest. HTH On Mon, 2005-09-12 at 14:35 +0200, Cyriaque Dupoirieux wrote: > Hi, > > First of all, David Crossley sent a mail - *[2005-09-05 0:21:19] new > committer and PMC member: Cyriaque Dupoirieux* - announcing the PMC had > invited me to become a committer and a member of the PMC and I could not > answer because I was far from home... > So, I want to thank you all, I had accepted with pleasure. > > Now I have problem to update my svn working copy. > At the beginning of august, I sent several patches to add the pelt view. > To make these patches, I added several new files - such as pelt.fv, > or several templates... - and now, I realize that svn update does not > merge the repository files with my working copy and put a warning such as : > > svn: Failed to add file > > 'whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/resources/templates/siteinfo-meta-icon.ft': > object of the same name is already scheduled for addition > > Do you know what I should do. > (I was not commiter yet at this time...) -- thorsten "Together we stand, divided we fall!" Hey you (Pink Floyd)
