commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: [math] Strange svn conflict
Date Sat, 24 Dec 2011 15:19:50 GMT
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/distribution/BinomialDistribution.java
> Repository Root: http://svn.us.apache.org/repos/asf
> Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
> Revision: 1222933
> Node Kind: file
> Last Changed Author: celestin
> Last Changed Rev: 1210359
> Last Changed Date: 2011-12-05 09:15:38 +0100 (Lun, 05 déc 2011)
> 
> EU MIRROR
> Path: BinomialDistribution.java
> Name: BinomialDistribution.java
> URL: http://svn.eu.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java
> Repository Root: http://svn.eu.apache.org/repos/asf
> Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
> Revision: 1222933
> Node Kind: file
> Last Changed Author: celestin
> Last Changed Rev: 1209963
> Last Changed Date: 2011-12-03 19:23:02 +0100 (Sam, 03 déc 2011)
> 
> It seems strange that the 'Last Changed Rev' fields should be
> different for each mirror. Could that be the origin of our troubles?
> 

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/org/apache/commons/math/distribution/BetaDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/CauchyDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ChiSquaredDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ExponentialDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/FDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/GammaDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/HypergeometricDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/KolmogorovSmirnovDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/NormalDistribution.java
UU  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/PascalDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/PoissonDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/TDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/WeibullDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/ZipfDistribution.java

harmonia,0: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/org/apache/commons/math/distribution/PascalDistribution.java
_U  commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/SaddlePointExpansion.java

The harmonia version is definitely wrong.  Commons devs (especially
celestin) --- please confirm whether or not r1210359 _on svn.us.apache.org_
is correct.

> Thanks a lot in advance for your help, and a very merry Christmas 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