You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Sébastien Brisard <se...@m4x.org> on 2011/12/23 09:22:47 UTC
[math] Strange svn conflict messages
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
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 new one, applied my patch, and tried to commit it...
same answer from svn.
My knowledge of svn is very limited, and I must turn to others for a
little bit of support...
Thanks !
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math] Strange svn conflict messages
Posted by Sébastien Brisard <se...@m4x.org>.
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: 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: 1222846
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
=========
svn info http://svn.eu.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/distribution/BinomialDistribution.java
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: 1222847
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)
This indeed suggests that both mirrors are not exactly synchronized.
How can we force this?
Sébastien
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math] Strange svn conflict messages
Posted by Sébastien Brisard <se...@m4x.org>.
>
> 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-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math] Strange svn conflict messages
Posted by Gilles Sadowski <gi...@harfang.homelinux.org>.
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 prevous message of yours...
> >> I've tried again to commit, with no success.
> >> Is there something I can do to investigate a synchronization problem
> >> between different repositories?
> > I have no clue.
> > As you might have read in that other thread, we didn't find the cause of the
> > problem. It just went away after Phil committed some change into the
> > "corrupted" files.
>
> Yes, we never actually figured out what was going on there. I agree
> with the intuition that it could have something to do with EU mirrors.
>
> Try posting a summary of the two problems to infrastructure@
>
> If you do not get a good response there, I would recommend opening a
> subversion JIRA.
Thanks for the suggestion.
Sébastien,
Will you do it?
Best,
Gilles
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math] Strange svn conflict messages
Posted by Phil Steitz <ph...@gmail.com>.
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 there something I can do to investigate a synchronization problem
>> between different repositories?
> I have no clue.
> As you might have read in that other thread, we didn't find the cause of the
> problem. It just went away after Phil committed some change into the
> "corrupted" files.
Yes, we never actually figured out what was going on there. I agree
with the intuition that it could have something to do with EU mirrors.
Try posting a summary of the two problems to infrastructure@
If you do not get a good response there, I would recommend opening a
subversion JIRA.
Phil
>
>> M SVN is using
>> https://svn.apache.org/repos/asf/commons/proper/math/trunk
>> as a repository.
> Same here.
>
>
> Season's Greetings,
> Gilles
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math] Strange svn conflict messages
Posted by Gilles Sadowski <gi...@harfang.homelinux.org>.
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 synchronization problem
> between different repositories?
I have no clue.
As you might have read in that other thread, we didn't find the cause of the
problem. It just went away after Phil committed some change into the
"corrupted" files.
> M SVN is using
> https://svn.apache.org/repos/asf/commons/proper/math/trunk
> as a repository.
Same here.
Season's Greetings,
Gilles
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math] Strange svn conflict messages
Posted by Sébastien Brisard <se...@m4x.org>.
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 problem
between different repositories?
M SVN is using
https://svn.apache.org/repos/asf/commons/proper/math/trunk
as a repository.
Sébastien
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: [math] Strange svn conflict messages
Posted by Gilles Sadowski <gi...@harfang.homelinux.org>.
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
> consistently run into the following message
> {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 new one, applied my patch, and tried to commit it...
> same answer from svn.
>
> My knowledge of svn is very limited, and I must turn to others for a
> little bit of support...
Same problem here.
And it is the second time it happens:
http://markmail.org/message/ocea43hf2gxvrzan
Could it be related to synchronisation problem between the SVN repositories?
Regards,
Gilles
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org