Dean Schulze wrote:
> I've merged one branch to another one, resolved conflicts, and committed
> everything.
>
> Now I edit two files. When I commit I get this message:
>
> svn: Commit failed (details follow):
> svn: File or directory 'index.jsp' is out of date; try updating
> svn: The version resource does not correspond to the resource within the
> transaction. Either the requested version resource is out of date
> (needs to be updated), or the requested version resource is newer than
> the transaction root (restart the commit).
>
> The file index.jsp is not out of date. It was edited. I also did an
> update like it asked but it still gives this error.
>
> This also happens with Tortoise, so it's not necessarily a Subclipse
> problem.
>
> I'm using 1.5 clients against an older server, but this isn't supposed
> to matter.
>
> What do I have to do to get SVN to commit this file?
>
> Thanks.
Did you try to update?
Sometime you need to update, even if it is not obvious.
Iv
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subclipse.tigris.org
For additional commands, e-mail: users-help_at_subclipse.tigris.org
Received on 2008-07-10 02:20:33 CEST