subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <>
Subject Re: [math] Strange svn conflict
Date Tue, 27 Dec 2011 13:06:18 GMT
> > - How to reproduce the errors you saw?  Can you show the output of `svn
> >  diff` at the time of a failed commit attempt?
> >
> I hope this mailing list allows for attachements, in which case you
> will find attached the patch I've been trying to commit for several
> days now. It is a rather large patch, but I don't think that this is
> the cause for our current troubles, since I've tried to commit only a
> small piece and it did not work either.
> Just to be sure the trouble was still occuring, I've just tried to
> commit these changes, and here is what I get.
> org.tigris.subversion.javahl.ClientException: Merge conflict during commit

(this is a server-side error SVN_ERR_FS_CONFLICT; it has nothing to do
with 'svn merge')

> svn: Commit failed (details follow):
> svn: File or directory
> 'main/java/org/apache/commons/math/distribution/'
> is out of date; try updating
> svn: resource out of date; try updating

You probably recognize this error as the one meaning 'run "svn update"
and try the commit again.  ("update" needs to be run on the containing
directory, not only on the files in question.)'  However, you remarked
earlier that you also get this error if you 'rm -rf' your working copy
and try to commit from a new one, right?

View raw message