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

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):
svn: File or directory '/branches/yp/www/html/intern/alerts/ajax' is out of date


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?


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.


On Wed, Mar 4, 2009 at 11:26 PM, Murli Varadachari
<mvaradachari_at_facebook.com> wrote:
> I am trying to merge from trunk to branch and I get this error "svn: File
> not found: revision 148570, path '/branches/yp/www/html/intern/ods/alarms'.
> The command I am using
> is "svn merge -r144695:148570 svn+ssh://prod/trunk/www
> <WC-of-//prod/branches/yp/www>".
> The branch in question '/branches/yp/www' was created from '/trunk/www'
> @140482. Subsequently I did a merge from /trunk and from a couple of other
> branches. I am now trying to merge from the trunk to branch one last time
> before I re-integrate back to trunk. However I am stuck with the above
> issue. A substantial number of files /dirs etc were merged or added
> successfully before it burped.
> A thorough examination of the history of the trunk indicates that @rev#
> 145142 /trunk/www/html/intern/alerts was moved / renamed to
> '/trunk/www/html/intern/ods/alarms'. Are there issues with svn merge w.r.t
> its ability to handle renamed components. I am currently using svn 1.5.3 .
> The history of this particular merge can be seem from svn:mergeinfo
> properties
> svn:mergeinfo : ==>
> /prod/branches/v3x/www:140558-142418
> /prod/branches/xx/www:83462-126155
> /prod/releases/r126219-10122008/www:126613,126628,126633-126634
> /prod/trunk/www:140483-144695
> Any help will be appreciated.
> Cheers
> murli

Mark Phippard
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.