Observations at the Humanities and Technology Crossroads
svn Skipped ‘path/to/file’ is misleading
Following the instructions for “shelving” work in progress using Subversion, I tried to merge my work back onto the trunk, but kept getting the following “error” messages:
“Skipped ‘path/to/file/on/shelf/but/not/in/trunk’”
I read and re-read the Subversion documentation for merging and it made it sound like I was doing something wrong. I finally found a posting with instructions on how to merge in spite of the “Skipped” error message… so I tried it, and it worked (in spite of the misleading messages). The trick really is to ignore the messages.
Note that following the merge, files that are in the source branch and not in the destination branch need to be svn added before they will end up in the destination.
I sincerely hope this post helps others save the two or three hours I lost trying to figure out what I was doing wrong!
| Print article | This entry was posted by Gustave Stresen-Reuter on March 12, 2007 at 10:08 pm, and is filed under Development. Follow any responses to this post through RSS 2.0. You can leave a response or trackback from your own site. |
about 1 year ago
I just ran into this and after being unable to figure out what the hell it meant, went on a several minute swearing tirade.
So your blog post helped me a great deal, thanks.