Mailing-List: contact dev-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Commons Developers List" <dev@commons.apache.org>
Received-SPF: pass (athena.apache.org: domain of sebastien.brisard@gmail.com
 designates 209.85.212.43 as permitted sender)
MIME-Version: 1.0
Sender: sebastien.brisard@gmail.com
In-Reply-To: <20111227130618.GB6071@daniel3.local>
References: 
 <CAGRH7HrKdM9tHU43HEpv066W2-3_0BFNQdGnSgxneNvkAMc2ag@mail.gmail.com>
	<20111224151821.GA28983@daniel3.local>
	<CAGRH7HrF_nq-NvSmzveO2FRLojmOJ57u0XdbnJgoYg6EtkqkqQ@mail.gmail.com>
	<20111224202110.GA1292@daniel3.local>
	<CAGRH7Hqa-0xBBss6hWrCOyjZcVpSVS9agFHMq-bA8sxi5cD12A@mail.gmail.com>
	<20111227130618.GB6071@daniel3.local>
Date: Tue, 27 Dec 2011 21:41:59 +0100
Message-ID: 
 <CAGRH7Hp41oyF-cZ9HLd0GL-JwKcFP7RrOL+8L282O3qiR-Vc2g@mail.gmail.com>
Subject: Re: [math] Strange svn conflict
From: =?ISO-8859-1?Q?S=E9bastien_Brisard?= <celestin@apache.org>
To: Daniel Shahaf <d.s@daniel.shahaf.name>
Cc: Commons Developers List <dev@commons.apache.org>,
 infrastructure@apache.org,
	users@subversion.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Hi,

Le 27 d=E9cembre 2011 14:06, Daniel Shahaf <d.s@daniel.shahaf.name> a =E9cr=
it :
>> > - How to reproduce the errors you saw? =A0Can you show the output of `=
svn
>> > =A0diff` 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 comm=
it
>
> (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.jav=
a'
>> 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. =A0("update" needs to be run on the containing
> directory, not only on the files in question.)' =A0However, 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=E9bastien

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