Re: Trunk to branch merge error on renamed component
From: Murli Varadachari <mvaradachari_at_facebook.com>
Date: Thu, 5 Mar 2009 18:45:52 -0800
I just tried using subversion 1.5.6 as well as 1.6
It did go past the previous point of failure and the merge completed OK. However it fails on commit with the following error message =>>
==>>
svn: Commit failed (details follow):
==>>
As far as I can see the branch WC is fully up-to date. Problem still seems to be related to the moved / renamed component
"trunk/www/html/intern/alerts" -> "trunk/www/html/intern/ods/alarms" .
Is it possible the bug fix for merge may need a corresponding fix for commit?
Cheers
On 3/5/09 4:35 AM, "Mark Phippard" <markphip_at_gmail.com> wrote:
All known causes of this problem were fixed in 1.5.5 client. Try 1.5.5/1.5.6.
Mark
On Wed, Mar 4, 2009 at 11:26 PM, Murli Varadachari
-- Thanks Mark Phippard http://markphip.blogspot.com/ ------------------------------------------------------ http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1274991 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].Received on 2009-03-06 03:47:09 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.