commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sébastien Brisard <sebastien.bris...@m4x.org>
Subject Re: [math] Strange svn conflict
Date Sat, 24 Dec 2011 13:06:16 GMT
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 trying to commit new patches. Here is a
typical example of the message I recently got while trying to commit a patch
{code}
Merge conflict during commit
svn: Commit failed (details follow):
svn: File or directory
'main/java/org/apache/commons/math/distribution/BinomialDistribution.java'
is out of date; try updating
svn: resource out of date; try updating
{code}
I've tried the obvious: svn clean, followed by svn update... no
success. Then, I found on the internet that the file .svn/all-wcprops
should be removed, but that didn't work either. More radically, I've
just removed my local copy of the math project, and checked out a
brand new one, applied my patch, and tried to commit it... same answer
from svn.

Gilles Sadowski went through exactly the same problem (and tried
exactly the same tricks) a few weeks ago, with no more success. The
problem was solved when Phil Steitz performed some changes on the
incriminated files.

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 file causing the conflict, for both
US/EU mirrors. He also wrote that running `svn info` actually forced
some kind of synchronization between both mirrors (or so I
understood). So I ran `svn info`, then tried again to commit, but that
did not work either.

Here is what `svn info` returns

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?

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