Menu
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?
223
In the From URL option, you should specify the branch to which you want to merge. For example, assume that there are 2 branches, branch A and branch B , and you want to merge branch B to branch A . In TortoiseSVN, click on Merge option and then select Merge two different trees option.
Reverse Merge - Use Subversion reverse merge to roll back a change or multiple changes that have been committed to the repository, and then apply this to your working copy.
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. :)
176
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
