Search code examples
svnmergechecksummismatch

svn: Checksum mismatch

This is a duplicate of this question, but that question was never answered.

I'm merging changes from trunk into a feature branch. During the merge, I run into the following error:

svn: Checksum mismatch for 'projs/Services/TestPage.html':
   expected checksum:  cc53fe9f106b5f7fffe52ff7d1833b43
   actual checksum:    ca458ae559e2c3b5adba630e078e98df

svn: Error reading spooled REPORT request response

I've confirmed the checksum on the file:

$ md5sum TestPage.html
cc53fe9f106b5f7fffe52ff7d1833b43

I've also check .svn/entries file and verified it has the same checksum. From that standpoint, everything matches.

Finally, I've followed the general advice for fixing this problem and deleted my working directory, then checked it out again. That did not work. Neither did trying the process on a different machine.

Is there a way to either fix this problem or convince the merge to skip it and move on? I would be fine manually updating the file as it is non-essential for the feature branch.

In case this helps, the SVN version is:

$ svn --version
svn, version 1.6.17 (r1128011)
   compiled Jun 26 2013, 20:44:02
Solution

  • I don't have an answer for why this problem happened or the "proper" way to fix it, but I did find a workaround that might be helpful. Here's what I did:

    1. Manually merged the parent of TestPage.html from trunk into the feature branch.
    2. Ran 'svn merge --record-only' on the parent directory. This marks the files as merged without making any changes besides changing the merge info.

    After that I was able to complete the merge as normal.