SVN error when trying to merge from a branch

svn merge branch visualsvn trunk
Jonathan picture Jonathan · Aug 14, 2009 · Viewed 7.1k times · Source

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?

Answer

Jonathan picture Jonathan · Aug 14, 2009

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. :)

Related questions

Using TortoiseSVN how do I merge changes from the trunk to a branch and vice versa?

I've been reading up on branching/merging with Subversion 1.5 using the excellent and free Version Control with Subversion book. I think that I understand how to use the Subversion command line client to perform the actions that I need most …

Read More
Subversion branch reintegration

When a branch is reintegrated to the trunk, is that branch effectively dead? Can you make modifications to the branch after the reintegration and merge those back into the trunk at a later date?

Read More
Can I update a branch from the trunk without performing a merge?

I probably just haven't thought this through, or perhaps I'm simply unaware of an already existing option in Subversion (I'm certainly no expert). I'm just wondering, if I've created a branch to start working on some new feature, if there's …

Read More