Erva的专栏

problem is as the titlesolution:svn remove --force filenamesvn resolve --accept=working filenamesvn commit

Error:svn: Commit failed (details follow):svn: File '/lujia/paper/icia2013/spaauction.log' is out of dateSolution:$ svn up$ svn resolve --accept=working filenamedone

Q: *.tex file is out of dateA: as the following steps1. delete the *.tex in somewhere else.2. current path: svn resolved /path/to/dir/or/filesvn update --force /path/to/dir/or/filesvn

$rm -rf `find . -name .svn`

- Delete all local contentsrm -rf content

svn resolved

One approach would be to:Copy edited items to another location.Delete the folder containing the problem path.Update the containing folder through Subversion.Copy your files back or merge changes a