You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Edmund Wong <ed...@belfordhk.com> on 2009/03/21 06:14:08 UTC
merging error
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.
Edmund
--
"Pax tecum"
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1370479
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: merging error
Posted by Edmund Wong <ed...@belfordhk.com>.
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.
Edmund
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1387655
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].