[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merging error

From: Edmund Wong <edmund_at_belfordhk.com>
Date: Mon, 23 Mar 2009 15:48:07 +0800

Edmund Wong wrote:
> Hi,
> My initial foray into merging a branch revision with a trunk revision
> ended in a failure/error. I'm using the TortoiseSVN client.
> Server is v1.5.6 (or maybe 1.5.5).
> I got :
> Merging revisions 1013-1014 of <branch url> <local WC path>"
> Error: http://subversion.tigris.org/xmlns/dav/md5-checksum' was not \
> present on the resource
> IIRC, I did setup the server to use DAV.
> Why is there a reference to an external url?
> Any clarifications appreciated.

An error on my part produced this error. I don't know what his
error is for, but the reason why it appeared because I was trying
to merge a branch into one file. I forgot to specify the
filename in the merge-from entry in TortoiseSVN-Merge.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-23 13:28:23 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.