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 Sat, 24 Dec 2011 16:37:02 GMT
>
> 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.
>
As far as I (== celestin) can judge, *both* versions look OK. What I
did is svn checkout of the latest version on both repositories. Then,
I ran diff on each of the files listed above. *All* files are
identical, but for the svn:keywords which *might* sometimes differ.

More precisely, the following files are strictly identical on both repositories
ChiSquaredDistribution.java (HEAD=r1210756)
ExponentialDistribution.java (HEAD=r1209963)
FDistribution.java (HEAD=r1210756)
GammaDistribution.java (HEAD=r1210756)
NormalDistribution.java (HEAD=r1210756)
TDistribution.java (HEAD=r1210756)

while the following files are tagged r1210359 on us mirror, and
r1209963 on the eu mirror (but the remainder of the files are
identical)
BinomialDistribution.java
CauchyDistribution.java
HypergeometricDistribution.java
KolmogorovSmirnovDistribution.java
PoissonDistribution.java
WeibullDistribution.java
ZipfDistribution.java
I *believe* these files should in fact be tagged r1210359 on *both*
repositories.

Does that help?
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