If you're using Subversion, and ever get this error when doing an svn merge:

  • "Working copy path xyz does not exist in repository"

... look here for the solution.

(Summary: edit the ".svn/entries" file, and look for an incorrect revision="0" attribute, and set it to the correct value.)