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 Fri, 30 Dec 2011 15:24:38 GMT
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, I'd like to figure out how those revisions with bogus 'log -qv'
>> > output were created, and if you have the time to provide a self-contained
>> > reproduction recipe (starting with 'svnadmin create', and svn and/or
>> > eclipse) we'd appreciate it.
>> >
>> I'll try my best to do that.
>>
>
> Thanks.
>
I'm very willing to try, but I'm not sure I really understand (please
excuse my very shallow knowledge of SVN...).

>
> Can you isolate the following factors:
>
> - Size of the patch.  Can you commit a smaller patch --- that touches
>  all the same files your patch does?  A smaller patch that touches
>  other files?
>

As I'm not sure this mailing list allow for attachment, I've
copied/pasted a very small patch which does demonstrate the bug (at
least, on my computer).


*****BEGIN PATCH*****

Index: src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java
===================================================================
--- src/main/java/org/apache/commons/math/distribution/BinomialDistribution.jav(revision
1225833)
+++ src/main/java/org/apache/commons/math/distribution/BinomialDistribution.jav(working
copy)
@@ -23,7 +23,7 @@
 import org.apache.commons.math.util.FastMath;

 /**
- * Implementation of the binomial distribution.
+ * Implementation of the binomial distribution. DUMMY MODIFICATION
  *
  * @see <a href="http://en.wikipedia.org/wiki/Binomial_distribution">Binomial
distribution (Wikipedia)</a>
  * @see <a href="http://mathworld.wolfram.com/BinomialDistribution.html">Binomial
Distribution (MathWorld)</a>

*****END PATCH*****

I've tried to commit this patch
1. with eclipse + JavaHL client, this raises the same error as before

*****BEGIN ERROR-MESSAGE*****
svn: Commit failed (details follow):
svn: File or directory 'BinomialDistribution.java' is out of date; try updating
svn: resource out of date; try updating
*****END ERROR-MESSAGE*****

2. with eclipse + SVNKit client: same story
3. with command-line svn: same story

>
> - Client.  Can you reproduce the errors using (a) eclipse with SVNKit,
>  (b) eclipse with Subversion's official JavaHL bindings, (c) the
>  cmdline client?
>
See above. Just curious: how do you force JavaHL or SVNKit client with
cmdline? Is this a silly question?

>
> - 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
>  in your /etc/hosts file)
>
Just for the record, the above tests were carried out with the
repository https://svn.apache.org/repos/asf/commons/proper/math/trunk.
As I'm in Europe, I suppose the EU mirror was used (is there a way to
check?). I've tried to commit the same patch to svn-master. For some
reasons, I get many error messages with subclipse. For lack of time, I
therefore only tested the command-line client. It WORKED!!! See rev
1225839, and 1225841.

As previously mentioned, Gilles already encountered the same
difficulty, and the problem was only solved when Phil managed to
successfully commit a dummy patch to the incriminated file. So now
that the patch was accepted, I tried to commit to
https://svn.apache.org/repos/asf/commons/proper/math/trunk the
following patch

*****BEGIN PATCH*****
### Eclipse Workspace Patch 1.0
#P Apache Commons Math
Index: src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java
===================================================================
--- src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java	(revision
1225842)
+++ src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java	(working
copy)
@@ -23,7 +23,7 @@
 import org.apache.commons.math.util.FastMath;

 /**
- * Implementation of the binomial distribution.
+ * Implementation of the binomial distribution. DUMMY MODIFICATION, SECOND TAKE
  *
  * @see <a href="http://en.wikipedia.org/wiki/Binomial_distribution">Binomial
distribution (Wikipedia)</a>
  * @see <a href="http://mathworld.wolfram.com/BinomialDistribution.html">Binomial
Distribution (MathWorld)</a>
*****END PATCH*****

It WORKED !!!

- r1225843 used subclipse + JavaHL,
- r1225844 used subclipse + SVNKit.

Does all that help? Can I try and commit the longer patch that
initially was the cause of this thread, or should I wait for you to
explore in more detail this issue?

Best regards, thanks again for your 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