error, processing, command, merge, svn, subversion
What to do when you receive the Subversion error message "error processing command" for a merge
The other day I was running an svn update and cancelled it, thinking that subversion used atomic updates, like commits. This was wrong.
The error I was getting was "Error Processing Command: Merge" and the message suggested I run the svn cleanup command.
What was worse is that I had used the eclipse function "mark file for merge" on a conflicted file and after the update was canceled I couldn't update or unlock this file. Revert command didn't even work, nor did the subversion cleanup command. This is what I finally ended up doing.
- move the affected subdirectory out of the working copy -- put it somewhere else so it becomes invisible to SVN
- cd to the root of the working copy
- svn cleanup as necessary
- svn update, which will recreate a clean subdirectory, with all the correct permissions.
- manually merge any changes to the subdirectory's files from the previously moved version. Do NOT copy back in any of the .svn control area.
- svn diff to verify the manual merge
- svn commit should now work, since the permissions have been fixed.
Comments
Post a new comment by filling out the form. All fields are required.