Strange commit failure on release branch.

Folks, I'm trying to update the Boost.Math docs on the release branch but I get: Error: Commit failed (details follow): Error: File or directory 'html\math_toolkit\special\expint\expint_i.html' is out of Error: date; try updating Error: The version resource does not correspond to the resource within the Error: transaction. Either the requested version resource is out of date (needs to be Error: updated), or the requested version resource is newer than the transaction root Error: (restart the commit). Now the thing is I *have* made sure that the whole branch is up to date, and in any cases there are no changes to that file in SVN, so I'm stumped. Any ideas anyone? Thanks, John.

Could it be that someone has updated the offending file before you committed the change and created a conflict? If you do an update on top of your changes, do you get merge conflicts? Never hurts to do and svn cleanup from time to time either. Pascal On 18/07/2008, John Maddock <john@johnmaddock.co.uk> wrote:
Folks, I'm trying to update the Boost.Math docs on the release branch but I get:
Error: Commit failed (details follow): Error: File or directory 'html\math_toolkit\special\expint\expint_i.html' is out of Error: date; try updating Error: The version resource does not correspond to the resource within the Error: transaction. Either the requested version resource is out of date (needs to be Error: updated), or the requested version resource is newer than the transaction root Error: (restart the commit).
Now the thing is I *have* made sure that the whole branch is up to date, and in any cases there are no changes to that file in SVN, so I'm stumped. Any ideas anyone?
Thanks, John. _______________________________________________ Unsubscribe & other changes: http://lists.boost.org/mailman/listinfo.cgi/boost

Pascal Dennerly wrote:
Could it be that someone has updated the offending file before you committed the change and created a conflict? If you do an update on top of your changes, do you get merge conflicts?
Never hurts to do and svn cleanup from time to time either.
Been there done that :-( In the end I had to delete the whole tree, check out again and redo the merge :-( John.
participants (2)
-
John Maddock
-
Pascal Dennerly