I received this message when I ran a SVN UP:
Skipped \'trunk/scripts/accountability_survey_report.php\'
At revision 1585.
Summary of conflicts:
Skipped pat
It happened because the file has got conflict, just set this file as "resolved" and try the update again, this will become more easy with a graphic client svn.
I had this same issue, today. I did svn info
on the file. It muttered something about Tree conflict: local missing, incoming edit upon merge
. I am not sure how this could happen.
I fixed this by doing a svn resolve --accept working
and svn up
on the file, problem solved.
I know this sounds simple but I'm going to post it just in case anyone else made the same mistake as me. Make certain you are updating from the correct directory. I got this error when I pressed svn up from the wrong directory.
Some more info, trying to deduce what happened, I found this error message when doing a svn info FILENAME Tree conflict: local delete, incoming edit upon update and this one: Tree conflict: local obstruction, incoming add upon merge I found this post that fixed my problem: http://little418.com/2009/05/svn-local-obstruction-incoming-add-upon-merge.html
If you get something like this for example:
Summary of conflicts: Skipped paths: 2
Just make sure you are in the correct directory.
I just did this and realized I hadn't navigated to the working directory.
Hope this helps! :)