commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sébastien Brisard <celes...@apache.org>
Subject Re: [math] Strange svn conflict
Date Tue, 27 Dec 2011 20:41:59 GMT
Hi,

Le 27 décembre 2011 14:06, Daniel Shahaf <d.s@daniel.shahaf.name> a écrit :
>> > - 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/BinomialDistribution.java'
>> 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?
>

That's correct. I did update on the directory, as well as checkout a
brand new working copy of Commons-Math.
Was the attached patch of any use to you?
Sébastien

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Mime
View raw message