Re: [math] Strange svn conflict

2011-12-30 Thread Sébastien Brisard
Le 30 décembre 2011 23:30, Daniel Shahaf a écrit : > Sébastien Brisard wrote on Fri, Dec 30, 2011 at 16:24:38 +0100: >> Hi, >> sorry for the delay. I have carried out a few more experiments (see below). >> Sébastien >> >> >> >> Should I move to svn 1.7 ? >> >> >> >> >> > >> >> > You could try movi

Re: [math] Strange svn conflict

2011-12-30 Thread Daniel Shahaf
> > - Server.  Does the error reproduce if you check out your working copy > >  from svn-master.apache.org?  (If you literally check out from > >  https://svn-master.apache.org/repos/asf/... you'll get SSL warnings; > >  you can either bypass them or set > >  # 140.211.11.4        svn.apache.org >

Re: [math] Strange svn conflict

2011-12-30 Thread Daniel Shahaf
Sébastien Brisard wrote on Fri, Dec 30, 2011 at 16:24:38 +0100: > Hi, > sorry for the delay. I have carried out a few more experiments (see below). > Sébastien > > >> >> Should I move to svn 1.7 ? > >> >> > >> > > >> > You could try moving to 1.7, and/or using the official JavaHL bindings > >> > i

Re: [math] Strange svn conflict

2011-12-30 Thread Sébastien Brisard
Hi, sorry for the delay. I have carried out a few more experiments (see below). Sébastien >> >> Should I move to svn 1.7 ? >> >> >> > >> > You could try moving to 1.7, and/or using the official JavaHL bindings >> > instead of the third-party SVNKit implementation.  With my svn hat on, >> > though,

Re: [math] Strange svn conflict

2011-12-28 Thread Daniel Shahaf
Sébastien Brisard wrote on Tue, Dec 27, 2011 at 21:39:52 +0100: > >> Should I move to svn 1.7 ? > >> > > > > You could try moving to 1.7, and/or using the official JavaHL bindings > > instead of the third-party SVNKit implementation.  With my svn hat on, > > though, I'd like to figure out how those

Re: [math] Strange svn conflict

2011-12-27 Thread Sébastien Brisard
Hi, Le 27 décembre 2011 14:06, Daniel Shahaf 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

Re: [math] Strange svn conflict

2011-12-27 Thread Sébastien Brisard
Le 27 décembre 2011 13:56, Daniel Shahaf a écrit : > Sébastien Brisard wrote on Mon, Dec 26, 2011 at 19:00:48 +0100: >> > >> > - Why would the N other files have been committed in that revision? >> >  Recall that those files had no text changes and their property lists >> >  were re-set to the val

Re: [math] Strange svn conflict

2011-12-27 Thread Daniel Shahaf
> > - 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 l

Re: [math] Strange svn conflict

2011-12-27 Thread Daniel Shahaf
Sébastien Brisard wrote on Mon, Dec 26, 2011 at 19:00:48 +0100: > > > > - Why would the N other files have been committed in that revision? > >  Recall that those files had no text changes and their property lists > >  were re-set to the values they already had. > > > I now recall what hapened at t

Re: [math] Strange svn conflict

2011-12-26 Thread Gilles Sadowski
> [...] > I hope I am not the one to blame for the current mess. I now realize > that I should have operated the refactoring outside Eclipse, using SVN > to remove the interface files, and rename the implementation files. > Also I should have used SVN as a command-line tool to check for the > prese

Re: [math] Strange svn conflict

2011-12-26 Thread Sébastien Brisard
Hi, and many thanks for your help > > I have a few questions still: > > - Can you run 'svn diff -c r1210359' (against either mirror) and confirm >  that that is exactly what you intended to commit? > Done on the EU mirror: the diff file seems OK to me. > > - Why would the N other files have been c

Re: [math] Strange svn conflict

2011-12-24 Thread Daniel Shahaf
[ CC += users@svn; context for them: 'svn commit' error report, and discovery that 'log -qv r1210359' differs between svn.eu.a.o and svn.us.a.o; it appears that only 'log -qv' is wrong (false positives) but the file contents/props are fine ] Sébastien Brisard wrote on Sat, Dec 24, 2011 at 17:37:02

[math] Strange svn conflict

2011-12-24 Thread Sébastien Brisard
> > You're right, that shouldn't be the case.  Something appears to be very wrong: > > eris,1:svn/asf% svnlook changed -r 1210359 $PWD > U   > commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractRealDistribution.java > _U   > commons/proper/math/trunk/src/main/java

Re: [math] Strange svn conflict

2011-12-24 Thread Sébastien Brisard
> > You're right, that shouldn't be the case.  Something appears to be very wrong: > > eris,1:svn/asf% svnlook changed -r 1210359 $PWD > U   > commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/AbstractRealDistribution.java > _U   > commons/proper/math/trunk/src/main/java

Re: [math] Strange svn conflict

2011-12-24 Thread Daniel Shahaf
Sébastien Brisard wrote on Sat, Dec 24, 2011 at 14:06:16 +0100: > It has been suggested on the dev mailing list that this might have > something to do with bad synchronization between different > repositories. Yesterday, Daniel was very doubtful about that, and > suggested we run svn info on the fi

Re: [math] Strange svn conflict

2011-12-24 Thread Daniel Shahaf
CC += celestin@ as author of r1210359 Sébastien Brisard wrote on Sat, Dec 24, 2011 at 14:06:16 +0100: > US MIRROR > Path: BinomialDistribution.java > Name: BinomialDistribution.java > URL: > http://svn.us.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distrib

Re: [math] Strange svn conflict

2011-12-24 Thread Sébastien Brisard
Hi, I wrote to infrastructure@ yesterday about problems we are currently facing with SVN at Commons-Math. Daniel answered, but I forgot to keep the infrastructure@ mailing list copied, so it's probably best to start afresh. At least two of us at Commons-Math have been confronted to conflicts while

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