Search code examples
svnmergebranchvisualsvntrunk

SVN error when trying to merge from a branch

I'm trying to merge changes from a branch to the trunk, for a single file and a single revision.

I'm using VisualSVN as the front-end.

So I right-click the file, Visual SVN -> Merge, then select ‘Merge a range of revisions’, then enter the revision number (from the log) and hit Next. Then I click ‘Test Merge’

What I get is the following error:

'http://subversion.tigris.org/xmlns/dav/md5-checksum' was not present on the resource.

Any ideas why this is happening?

Solution

  • Yay! A colleague figured out the problem.

    Even though I was right-clicking on the file and clicking 'Merge', the 'merge from' URL was set to the top-level folder of the branch.

    http://server.svn/Project/branches/1.0.2

    It should have specified the full path and filename of the file

    http://server.svn/Project/branches/1.0.2/folder/blah.cs

    Now I'm all the wiser. :)