Hi,
Is it up-to-date ? What happens if you do an "svn update" ?
Can it be that another process on that workspace is somehow
automatically started or your commit was aborted due to conflicts with
process ?
As far as I know (its not a lot) I got that message when two parallel
commits/updates were done on the same workspace by mistake
Tell up how you got progressed ?
Thanks,
Eli.
Damien Tougas wrote:
> Hello,
>
> I am having a problem doing a merge, here are all the steps I am
> following:
>
> svn co https://repository/path/project/trunk
>
> ... (checkout happens) ...
>
> cd trunk
> svn merge -r12345:HEAD https://repository/path/project/branches/1.0
>
> ... (merge happens, no conflicts) ...
>
> svn ci -m "merged from branch 1.0"
>
> ... (commit messages, followed by an error) ...
> Replacing src/java/x/FileName.java
> svn: Commit failed (details follow):
> svn: Item '/path/project/trunk/src/java/x/FileName.java' is out of date
>
> Anyone know what could be causing this? I assumed that since I check
> out the trunk just prior to doing the merge that my working copy
> would be up to date. Why would it be stating that it is out of date?
>
> Thanks.
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 3 08:08:08 2006