You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by er...@apache.org on 2010/08/26 10:59:33 UTC
svn commit: r989543 -
/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Author: erans
Date: Thu Aug 26 08:59:33 2010
New Revision: 989543
URL: http://svn.apache.org/viewvc?rev=989543&view=rev
Log:
MATH-410
Wrong variable ("argument" instead of "arguments").
Modified:
commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java?rev=989543&r1=989542&r2=989543&view=diff
==============================================================================
--- commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java (original)
+++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java Thu Aug 26 08:59:33 2010
@@ -70,7 +70,7 @@ public class FunctionEvaluationException
*/
public FunctionEvaluationException(double argument,
String pattern, Object ... arguments) {
- this(argument, new DummyLocalizable(pattern), argument);
+ this(argument, new DummyLocalizable(pattern), arguments);
}
/**
@@ -97,7 +97,7 @@ public class FunctionEvaluationException
*/
public FunctionEvaluationException(double[] argument,
String pattern, Object ... arguments) {
- this(argument, new DummyLocalizable(pattern), argument);
+ this(argument, new DummyLocalizable(pattern), arguments);
}
/**
@@ -150,7 +150,7 @@ public class FunctionEvaluationException
public FunctionEvaluationException(Throwable cause,
double argument, String pattern,
Object ... arguments) {
- this(cause, argument, new DummyLocalizable(pattern), argument);
+ this(cause, argument, new DummyLocalizable(pattern), arguments);
}
/**
@@ -181,7 +181,7 @@ public class FunctionEvaluationException
public FunctionEvaluationException(Throwable cause,
double[] argument, String pattern,
Object ... arguments) {
- this(cause, argument, new DummyLocalizable(pattern), argument);
+ this(cause, argument, new DummyLocalizable(pattern), arguments);
}
/**
@@ -208,5 +208,4 @@ public class FunctionEvaluationException
public double[] getArgument() {
return argument.clone();
}
-
}
Re: svn commit: r989543 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Posted by Rahul Akolkar <ra...@gmail.com>.
On Thu, Aug 26, 2010 at 6:37 PM, Gilles Sadowski
<gi...@harfang.homelinux.org> wrote:
>
>> > MATH-410
>> > Wrong variable ("argument" instead of "arguments").
>> >
>> > Modified:
>> > commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>
>> Could this be also put in the new MATH_2_X branch ?
>
> Certainly, but I don't know how to do it. :-}
>
<snip/>
The branch is here [1], svn co like you do the trunk.
-Rahul
[1] https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r989543 -
/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Posted by Gilles Sadowski <gi...@harfang.homelinux.org>.
> >>> MATH-410
> >>> Wrong variable ("argument" instead of "arguments").
> >>>
> >>> Modified:
> >>> commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
> >>
> >> Could this be also put in the new MATH_2_X branch ?
> >
> > Certainly, but I don't know how to do it. :-}
>
> Either you can check out the MATH_2_X branch and do the change here
> again or if you are already sure the file should be exactly the same in
> both versions you can copy it directly in the repository with a command
> like:
>
> svn cp -m "the commit message you want"
> https://svn.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
> https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Here is the command:
$ svn cp -m "MATH-410 (backport from trunk)" \
https://svn.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java \
https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
And the result:
svn: Failure opening
'/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java/FunctionEvaluationException.java'
Gilles
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r989543 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Posted by Luc Maisonobe <Lu...@free.fr>.
Le 27/08/2010 18:16, Gilles Sadowski a écrit :
>>>>>> MATH-410
>>>>>> Wrong variable ("argument" instead of "arguments").
>>>>>>
>>>>>> Modified:
>>>>>> commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>>>>
>>>>> Could this be also put in the new MATH_2_X branch ?
>>>>
>>>> Certainly, but I don't know how to do it. :-}
>>>
>>> Either you can check out the MATH_2_X branch and do the change here
>>> again or if you are already sure the file should be exactly the same in
>>> both versions you can copy it directly in the repository with a command
>>> like:
>>>
>>> svn cp -m "the commit message you want"
>>> https://svn.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>> https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>>
>> <snip/>
>>
>> The files may be identical, but their svn histories no longer are --
>> which means no server side copies please.
>
> To avoid changing by hand files that should be the same in both location,
> isn't there some "merge" command?
There is one, look at the subversion book for exact syntax of the
command
<http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.ref.svn.c.merge>.
Luc
>
> 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: svn commit: r989543 -
/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Posted by Gilles Sadowski <gi...@harfang.homelinux.org>.
> >>>> MATH-410
> >>>> Wrong variable ("argument" instead of "arguments").
> >>>>
> >>>> Modified:
> >>>> commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
> >>>
> >>> Could this be also put in the new MATH_2_X branch ?
> >>
> >> Certainly, but I don't know how to do it. :-}
> >
> > Either you can check out the MATH_2_X branch and do the change here
> > again or if you are already sure the file should be exactly the same in
> > both versions you can copy it directly in the repository with a command
> > like:
> >
> > svn cp -m "the commit message you want"
> > https://svn.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
> > https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
> >
> <snip/>
>
> The files may be identical, but their svn histories no longer are --
> which means no server side copies please.
To avoid changing by hand files that should be the same in both location,
isn't there some "merge" command?
Gilles
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r989543 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Posted by Phil Steitz <ph...@gmail.com>.
Rahul Akolkar wrote:
> On Fri, Aug 27, 2010 at 6:06 AM, Luc Maisonobe <Lu...@free.fr> wrote:
>> Le 27/08/2010 00:37, Gilles Sadowski a écrit :
>>>>> MATH-410
>>>>> Wrong variable ("argument" instead of "arguments").
>>>>>
>>>>> Modified:
>>>>> commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>>> Could this be also put in the new MATH_2_X branch ?
>>> Certainly, but I don't know how to do it. :-}
>> Either you can check out the MATH_2_X branch and do the change here
>> again or if you are already sure the file should be exactly the same in
>> both versions you can copy it directly in the repository with a command
>> like:
>>
>> svn cp -m "the commit message you want"
>> https://svn.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>> https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>
> <snip/>
>
> The files may be identical, but their svn histories no longer are --
> which means no server side copies please.
Yes, my strong recommendation is to just check out the 2_X branch
and port changes to the checkout, then commit. The merge command
using local paths can be helpful, but diffs should be observed and
tests run on the local 2_X (or trunk) checkout before committing.
Phil
>
> -Rahul
>
>
>> You can also use svn.eu.apache.org if you happen to use the european
>> mirror of the subversion repository.
>>
>> Luc
>>
>
> ---------------------------------------------------------------------
> 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: svn commit: r989543 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Posted by Rahul Akolkar <ra...@gmail.com>.
On Fri, Aug 27, 2010 at 6:06 AM, Luc Maisonobe <Lu...@free.fr> wrote:
> Le 27/08/2010 00:37, Gilles Sadowski a écrit :
>>
>>>> MATH-410
>>>> Wrong variable ("argument" instead of "arguments").
>>>>
>>>> Modified:
>>>> commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>>
>>> Could this be also put in the new MATH_2_X branch ?
>>
>> Certainly, but I don't know how to do it. :-}
>
> Either you can check out the MATH_2_X branch and do the change here
> again or if you are already sure the file should be exactly the same in
> both versions you can copy it directly in the repository with a command
> like:
>
> svn cp -m "the commit message you want"
> https://svn.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
> https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>
<snip/>
The files may be identical, but their svn histories no longer are --
which means no server side copies please.
-Rahul
> You can also use svn.eu.apache.org if you happen to use the european
> mirror of the subversion repository.
>
> Luc
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r989543 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Posted by Luc Maisonobe <Lu...@free.fr>.
Le 27/08/2010 00:37, Gilles Sadowski a écrit :
>
>>> MATH-410
>>> Wrong variable ("argument" instead of "arguments").
>>>
>>> Modified:
>>> commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>>
>> Could this be also put in the new MATH_2_X branch ?
>
> Certainly, but I don't know how to do it. :-}
Either you can check out the MATH_2_X branch and do the change here
again or if you are already sure the file should be exactly the same in
both versions you can copy it directly in the repository with a command
like:
svn cp -m "the commit message you want"
https://svn.apache.org/repos/asf/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
https://svn.apache.org/repos/asf/commons/proper/math/branches/MATH_2_X/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
You can also use svn.eu.apache.org if you happen to use the european
mirror of the subversion repository.
Luc
>
>
> 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: svn commit: r989543 -
/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Posted by Gilles Sadowski <gi...@harfang.homelinux.org>.
> > MATH-410
> > Wrong variable ("argument" instead of "arguments").
> >
> > Modified:
> > commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
>
> Could this be also put in the new MATH_2_X branch ?
Certainly, but I don't know how to do it. :-}
Gilles
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r989543 - /commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Posted by Luc Maisonobe <Lu...@free.fr>.
Le 26/08/2010 10:59, erans@apache.org a écrit :
> Author: erans
> Date: Thu Aug 26 08:59:33 2010
> New Revision: 989543
>
> URL: http://svn.apache.org/viewvc?rev=989543&view=rev
> Log:
> MATH-410
> Wrong variable ("argument" instead of "arguments").
>
> Modified:
> commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
Could this be also put in the new MATH_2_X branch ?
Luc
>
> Modified: commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java
> URL: http://svn.apache.org/viewvc/commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java?rev=989543&r1=989542&r2=989543&view=diff
> ==============================================================================
> --- commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java (original)
> +++ commons/proper/math/trunk/src/main/java/org/apache/commons/math/FunctionEvaluationException.java Thu Aug 26 08:59:33 2010
> @@ -70,7 +70,7 @@ public class FunctionEvaluationException
> */
> public FunctionEvaluationException(double argument,
> String pattern, Object ... arguments) {
> - this(argument, new DummyLocalizable(pattern), argument);
> + this(argument, new DummyLocalizable(pattern), arguments);
> }
>
> /**
> @@ -97,7 +97,7 @@ public class FunctionEvaluationException
> */
> public FunctionEvaluationException(double[] argument,
> String pattern, Object ... arguments) {
> - this(argument, new DummyLocalizable(pattern), argument);
> + this(argument, new DummyLocalizable(pattern), arguments);
> }
>
> /**
> @@ -150,7 +150,7 @@ public class FunctionEvaluationException
> public FunctionEvaluationException(Throwable cause,
> double argument, String pattern,
> Object ... arguments) {
> - this(cause, argument, new DummyLocalizable(pattern), argument);
> + this(cause, argument, new DummyLocalizable(pattern), arguments);
> }
>
> /**
> @@ -181,7 +181,7 @@ public class FunctionEvaluationException
> public FunctionEvaluationException(Throwable cause,
> double[] argument, String pattern,
> Object ... arguments) {
> - this(cause, argument, new DummyLocalizable(pattern), argument);
> + this(cause, argument, new DummyLocalizable(pattern), arguments);
> }
>
> /**
> @@ -208,5 +208,4 @@ public class FunctionEvaluationException
> public double[] getArgument() {
> return argument.clone();
> }
> -
> }
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org