Re: [math] Strange svn conflict messages Commons Dev.

2011-12-24 Thread Gilles Sadowski
Hello. > > > > > > Please keep the list CC'd.  More below. > > > > > > > I previously did a copy/paste of your message, but am now copying to > > the dev list. > > I was referring to the infrastructure@ list, which is the list to which > the message you replied off-list to was CC'd. > > Please

Re: [math] Strange svn conflict messages Commons Dev.

2011-12-24 Thread Daniel Shahaf
Sébastien Brisard wrote on Sat, Dec 24, 2011 at 08:49:34 +0100: > Hi Daniel, > > > > Please keep the list CC'd.  More below. > > > > I previously did a copy/paste of your message, but am now copying to > the dev list. I was referring to the infrastructure@ list, which is the list to which the mes

[math] Strange svn conflict messages Commons Dev.

2011-12-23 Thread Sébastien Brisard
Hi Daniel, > > Please keep the list CC'd.  More below. > I previously did a copy/paste of your message, but am now copying to the dev list. > > You're wrong.  The mirrors are synchronized --- and, in fact, after you > run the first command some commit was finalized *and got synced* before > you r

Re: [math] Strange svn conflict messages

2011-12-23 Thread Sébastien Brisard
I've been in touch with people at infrastructure, which suggested the following. US MIRROR = svn info http://svn.us.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java produces Path: BinomialDistribution.java Name: Bi

Re: [math] Strange svn conflict messages

2011-12-23 Thread Sébastien Brisard
> > Thanks for the suggestion. > > Sébastien, > Will you do it? > > > Best, > Gilles > Yes, I will (maybe not tonight, though!). Best regards! Sébastien - To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional

Re: [math] Strange svn conflict messages

2011-12-23 Thread Gilles Sadowski
On Fri, Dec 23, 2011 at 09:23:53AM -0700, Phil Steitz wrote: > On 12/23/11 6:47 AM, Gilles Sadowski wrote: > > Hello. > > > >>> Same problem here. > >>> And it is the second time it happens: > >>> http://markmail.org/message/ocea43hf2gxvrzan > >>> > >> I didn't realize I almost copied/paste a prev

Re: [math] Strange svn conflict messages

2011-12-23 Thread Phil Steitz
On 12/23/11 6:47 AM, Gilles Sadowski wrote: > Hello. > >>> Same problem here. >>> And it is the second time it happens: >>> http://markmail.org/message/ocea43hf2gxvrzan >>> >> I didn't realize I almost copied/paste a prevous message of yours... >> I've tried again to commit, with no success. >> Is

Re: [math] Strange svn conflict messages

2011-12-23 Thread Gilles Sadowski
Hello. > > > > Same problem here. > > And it is the second time it happens: > >  http://markmail.org/message/ocea43hf2gxvrzan > > > I didn't realize I almost copied/paste a prevous message of yours... > I've tried again to commit, with no success. > Is there something I can do to investigate a syn

Re: [math] Strange svn conflict messages

2011-12-23 Thread Sébastien Brisard
Hi Gilles, > > Same problem here. > And it is the second time it happens: >  http://markmail.org/message/ocea43hf2gxvrzan > I didn't realize I almost copied/paste a prevous message of yours... I've tried again to commit, with no success. Is there something I can do to investigate a synchronization

Re: [math] Strange svn conflict messages

2011-12-23 Thread Gilles Sadowski
On Fri, Dec 23, 2011 at 09:22:47AM +0100, Sébastien Brisard wrote: > Hello, > I'm sorry to come up with what will probably turn out to be a trivial > problem, but here is the thing. After minor modifications, I've tried > to commit the patch recently sent by Christian (MATH-692), and have > consist

[math] Strange svn conflict messages

2011-12-23 Thread Sébastien Brisard
Hello, I'm sorry to come up with what will probably turn out to be a trivial problem, but here is the thing. After minor modifications, I've tried to commit the patch recently sent by Christian (MATH-692), and have consistently run into the following message {code} Merge conflict during commit