svn: “local file delete, incoming file edit upon update”

Google knows all, most of the time. However, I know I’m in trouble when I the first link returned by a search for an error message in a widely used piece of software is a commit entry adding test scripts for that and related errors to the software.

So, just in case you run into this problem where Subversion thinks you have deleted a file locally and someone has updated the same file on the Subversion server you should use the following to fix it:

$ svn resolve
$ svn revert

Tell “svn resolve” to keep local changes (mc) which means the file will be deleted, and then “svn revert” will revert that delete. You’ll finally be back to a pristine work area.

Comments

comments

Leave a Reply