On Fri, Aug 01, 2008 at 10:27:20AM +1000, I wrote:
Try doing svn revert extension/internal/pdfinput/pdf-parser.cpp (perhaps preceded by svn diff to check whether there are any deliberate changes of yours to that file that you want to keep).
You might also look at the three files pdf-parser.cpp.mine, and the two [usually] pdf-parser.cpp.r* files.
Note that `svn revert' may well remove those files; do `svn revert' only once you're sure that you don't want to keep any of your changes to the file.
When I say `You might also look at the three files pdf-parser.cpp.*', what I actually mean is that you might do `diff -dup pdf-parser.cpp.rEARLIER pdf-parser.cpp.mine' to see your changes, and `diff -dup pdf-parser.cpp.r*' (assuming just two .r* files) to see the changes that have been made in svn. The top few entries of `svn log pdf-parser.cpp' may also be useful in understanding the .r* diffs -- particularly in this case.
If by chance you do have changes in that file that you want to keep, then once you've manually merged your changes and no longer need to pdf-parser.cpp.* files, you can do `svn resolved pdf-parser.cpp' to tell svn that pdf-parser.cpp now contains the desired merge of your changes and other people's changes in svn, and then svn will remove the pdf-parser.cpp.* files and will no longer flag pdf-parser.cpp as being in conflict.
pjrm.