Boost logo

Boost :

From: Pascal Dennerly (dnnrly_at_[hidden])
Date: 2008-07-18 11:33:22


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_at_[hidden]> 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
>


Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk