Re: Trunk to branch merge error on renamed component
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
> 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
> 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/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
> svn:mergeinfo : ==>
> Any help will be appreciated.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-05 13:35:59 CET
This is an archived mail posted to the Subversion Users