Re: Trunk to branch merge error on renamed component

On Thu, Mar 05, 2009 at 06:45:52PM -0800, Murli Varadachari wrote:
>
> 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
> ==>>

With which version of Subversion did this error happen?
With 1.5.6, or 1.6.0-rc3, or both? Please be precise.

> 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?

Did you really try to run 'svn update' after you got the out-of-date error?
What happens if you run 'svn update'?

Stefan
Received on 2009-03-06 16:30:42 CET