You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by sebb <se...@gmail.com> on 2011/12/16 11:33:51 UTC
Re: svn commit: r1215050 - in /commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src:
main/java/org/apache/commons/jexl2/internal/MethodExecutor.java test/java/org/apache/commons/jexl2/IssuesTest.java
On 16 December 2011 07:09, <he...@apache.org> wrote:
> Author: henrib
> Date: Fri Dec 16 07:08:59 2011
> New Revision: 1215050
>
> URL: http://svn.apache.org/viewvc?rev=1215050&view=rev
> Log:
> Unfix for JEXL-124, not supposed to happen on RC3 tag!
Did you revert by manual editting? Or using SVN commands?
The changes don't look like the exact inverse of the original - it
seems there are additional white-space changes.
The tag should be reverted to exactly what it was, not just the equivalent.
> Modified:
> commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java
> commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/test/java/org/apache/commons/jexl2/IssuesTest.java
>
> Modified: commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java
> URL: http://svn.apache.org/viewvc/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java?rev=1215050&r1=1215049&r2=1215050&view=diff
> ==============================================================================
> --- commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java (original)
> +++ commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/main/java/org/apache/commons/jexl2/internal/MethodExecutor.java Fri Dec 16 07:08:59 2011
> @@ -134,13 +134,10 @@ public final class MethodExecutor extend
> // and that arg is not the sole argument and not an array of the expected type,
> // make the last arg an array of the expected type
> if (actual[index] != null) {
> - Class<?> aclazz = actual[index].getClass();
> - if (!aclazz.isArray() || !aclazz.getComponentType().equals(type)) {
> - // create a 1-length array to hold and replace the last argument
> - Object lastActual = Array.newInstance(type, 1);
> - Array.set(lastActual, 0, actual[index]);
> - actual[index] = lastActual;
> - }
> + // create a 1-length array to hold and replace the last argument
> + Object lastActual = Array.newInstance(type, 1);
> + Array.set(lastActual, 0, actual[index]);
> + actual[index] = lastActual;
> }
> // else, the vararg is null and used as is, considered as T[]
> } else {
> @@ -179,3 +176,4 @@ public final class MethodExecutor extend
> }
> }
> }
> +
>
> Modified: commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/test/java/org/apache/commons/jexl2/IssuesTest.java
> URL: http://svn.apache.org/viewvc/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/test/java/org/apache/commons/jexl2/IssuesTest.java?rev=1215050&r1=1215049&r2=1215050&view=diff
> ==============================================================================
> --- commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/test/java/org/apache/commons/jexl2/IssuesTest.java (original)
> +++ commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src/test/java/org/apache/commons/jexl2/IssuesTest.java Fri Dec 16 07:08:59 2011
> @@ -719,21 +719,22 @@ public class IssuesTest extends JexlTest
> s = jexl.createScript("foo.'q u u x'");
> result = s.execute(jc);
> assertEquals("456", result);
> -
> +
> Debugger dbg = new Debugger();
> dbg.debug(((ExpressionImpl) s).script);
> String dbgdata = dbg.data();
> assertEquals("foo.'q u u x';", dbgdata);
> }
> -
> +
> public static class Container {
> String value0;
> int value1;
> +
> public Container(String name, int number) {
> value0 = name;
> value1 = number;
> }
> -
> +
> public Object getProperty(String name) {
> if ("name".equals(name)) {
> return value0;
> @@ -743,6 +744,7 @@ public class IssuesTest extends JexlTest
> return null;
> }
> }
> +
> public Object getProperty(int ref) {
> if (0 == ref) {
> return value0;
> @@ -752,24 +754,25 @@ public class IssuesTest extends JexlTest
> return null;
> }
> }
> -
> +
> public void setProperty(String name, String value) {
> if ("name".equals(name)) {
> this.value0 = value;
> }
> - }
> -
> + }
> +
> public void setProperty(String name, int value) {
> if ("number".equals(name)) {
> this.value1 = value;
> }
> - }
> + }
> +
> public void setProperty(int ref, String value) {
> if (0 == ref) {
> this.value0 = value;
> }
> - }
> -
> + }
> +
> public void setProperty(int ref, int value) {
> if (1 == ref) {
> this.value1 = value;
> @@ -782,44 +785,44 @@ public class IssuesTest extends JexlTest
> Container quux = new Container("quux", 42);
> Script get;
> Object result;
> -
> +
> Script getName = jexl.createScript("foo.property.name", "foo");
> result = getName.execute(null, quux);
> assertEquals("quux", result);
> -
> +
> Script get0 = jexl.createScript("foo.property.0", "foo");
> result = get0.execute(null, quux);
> assertEquals("quux", result);
> -
> +
> Script getNumber = jexl.createScript("foo.property.number", "foo");
> result = getNumber.execute(null, quux);
> assertEquals(42, result);
> -
> +
> Script get1 = jexl.createScript("foo.property.1", "foo");
> result = get1.execute(null, quux);
> assertEquals(42, result);
> -
> +
> Script setName = jexl.createScript("foo.property.name = $0", "foo", "$0");
> setName.execute(null, quux, "QUUX");
> result = getName.execute(null, quux);
> assertEquals("QUUX", result);
> result = get0.execute(null, quux);
> assertEquals("QUUX", result);
> -
> +
> Script set0 = jexl.createScript("foo.property.0 = $0", "foo", "$0");
> set0.execute(null, quux, "BAR");
> result = getName.execute(null, quux);
> assertEquals("BAR", result);
> result = get0.execute(null, quux);
> assertEquals("BAR", result);
> -
> +
> Script setNumber = jexl.createScript("foo.property.number = $0", "foo", "$0");
> setNumber.execute(null, quux, -42);
> result = getNumber.execute(null, quux);
> assertEquals(-42, result);
> result = get1.execute(null, quux);
> assertEquals(-42, result);
> -
> +
> Script set1 = jexl.createScript("foo.property.1 = $0", "foo", "$0");
> set1.execute(null, quux, 24);
> result = getNumber.execute(null, quux);
> @@ -827,27 +830,5 @@ public class IssuesTest extends JexlTest
> result = get1.execute(null, quux);
> assertEquals(24, result);
> }
> -
> - public static class Jeff {
> - public String concat(String... strs) {
> - if (strs.length > 0) {
> - StringBuilder strb = new StringBuilder(strs[0]);
> - for(int s = 1; s < strs.length; ++s) {
> - strb.append(", ");
> - strb.append(strs[s]);
> - }
> - return strb.toString();
> - } else {
> - return "";
> - }
> -
> - }
> - }
> -
> - public void test124() throws Exception {
> - JexlEngine jexl = new JexlEngine();
> - Script script = jexl.createScript("jeff.concat(['1', '2', '3'])", "jeff");
> - Object res = script.execute(null, new Jeff());
> - assertEquals("1, 2, 3", res);
> - }
> +
> }
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1215050 - in /commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src:
main/java/org/apache/commons/jexl2/internal/MethodExecutor.java test/java/org/apache/commons/jexl2/IssuesTest.java
Posted by sebb <se...@gmail.com>.
On 21 December 2011 11:27, sebb <se...@gmail.com> wrote:
> On 21 December 2011 05:40, Konstantin Kolinko <kn...@gmail.com> wrote:
>> 2011/12/17 sebb <se...@gmail.com>:
>>> On 16 December 2011 13:33, sebb <se...@gmail.com> wrote:
>>>> On 16 December 2011 12:19, henrib <he...@apache.org> wrote:
>>>>> I probably used manual editing, otherwise it would be properly reverted...
>>>>> If you have the svn command on top of your head to revert to the initial RC3
>>>>> version, please send it; I'd rather not f...up again - even better, apply it
>>>>> if you still can. :-)
>>>
>>> Still looking at how to do that; the svn merge command is not behaving
>>> quite as I expected in my workspace.
>>
>> I know two ways to go on if the reverse merge fails
>>
>> a) Drop current tag and repeat the revision that used to create it
>>
>> http://svn.apache.org/viewvc?view=revision&revision=1211956
>>
>
> That would be the neatest, as svn log would show the same as
> previously (apart from the revision of the tag itself).
>
>>
>> b) Overwrite wc with fresh copy of old files (it is good that nothing
>> was removed or added).
>>
>> 1. Checkout the tag at the current revision
>> 2. Export the tag at revision 1211956 into a new directory (or
>> checkout and delete .svn directories).
>>
>> That is:
>>
>> svn co https://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/
>> mywc
>> svn export https://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/@1211956
>> myexportdir
>>
>> 3. Then copy the files over checkout of the tag (myexportdir->mywc).
>> 4. Check the result
>>>svn st
>> M src\test\java\org\apache\commons\jexl2\IssuesTest.java
>> M src\main\java\org\apache\commons\jexl2\internal\MethodExecutor.java
>>
>> 5. Commit.
>
> I suspect the log for the tag will be quite complicated to follow.
> Will it show that the two files above are copied from the original tag?
>
> It might be worth trying deleting and recopying the updated files from
> the original versions.
> That might show the correct provenance; I'll try that in my test tag.
Had to "svn del BUILDING.txt" and then copy from the correct branch tag.
Seems to work OK.
svn log now shows the correct provenance:
>>>>>>>>>
r1221680 | sebb | 2011-12-21 11:31:40 +0000 (Wed, 21 Dec 2011) | 1 line
Changed paths:
R /commons/proper/jexl/tags/test-ignore/BUILDING.txt (from
/commons/proper/jexl/branches/2.0/BUILDING.txt:1221025)
Copied BUILDING.txt from branches/2.0/BUILDING.txt@1221025
------------------------------------------------------------------------
r1221045 | sebb | 2011-12-20 00:26:43 +0000 (Tue, 20 Dec 2011) | 1 line
Changed paths:
M /commons/proper/jexl/tags/test-ignore/BUILDING.txt
after merghe2
------------------------------------------------------------------------
...
<<<<<<<<
So I'll use that method to restore the two updated files.
> Failing that, I think recreation of the tag from the original branch
> revision is the best option, with the log making clear what was done.
> Maybe keep the mangled tag, but rename it first.
>
> ==
>
> I tried a 3rd option - reverse merge on the two changes, see
>
> http://svn.apache.org/viewvc/commons/proper/jexl/tags/test-ignore/
>
> However that resulted in a very messy change log:
>
> r1221045 | sebb | 2011-12-20 00:26:43 +0000 (Tue, 20 Dec 2011) | 1 line
> Changed paths:
> M /commons/proper/jexl/tags/test-ignore/BUILDING.txt
>
> after merghe2
> ------------------------------------------------------------------------
> r1221034 | sebb | 2011-12-20 00:11:53 +0000 (Tue, 20 Dec 2011) | 1 line
> Changed paths:
> M /commons/proper/jexl/tags/test-ignore/BUILDING.txt
> M /commons/proper/jexl/tags/test-ignore/src/main/assembly
> M /commons/proper/jexl/tags/test-ignore/src/main/config
> M /commons/proper/jexl/tags/test-ignore/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java
> M /commons/proper/jexl/tags/test-ignore/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java
> M /commons/proper/jexl/tags/test-ignore/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java
> M /commons/proper/jexl/tags/test-ignore/src/main/java/org/apache/commons/jexl2/parser/StringParser.java
> M /commons/proper/jexl/tags/test-ignore/src/test/scripts
>
> after merghe
> ------------------------------------------------------------------------
> r1221030 | sebb | 2011-12-19 23:58:49 +0000 (Mon, 19 Dec 2011) | 1 line
> Changed paths:
> M /commons/proper/jexl/tags/test-ignore/BUILDING.txt
>
> revert edit
> ------------------------------------------------------------------------
> r1221029 | sebb | 2011-12-19 23:58:29 +0000 (Mon, 19 Dec 2011) | 1 line
> Changed paths:
> M /commons/proper/jexl/tags/test-ignore/BUILDING.txt
>
> edit
> ------------------------------------------------------------------------
> r1221026 | sebb | 2011-12-19 23:56:38 +0000 (Mon, 19 Dec 2011) | 1 line
> Changed paths:
> A /commons/proper/jexl/tags/test-ignore (from
> /commons/proper/jexl/branches/2.0:1221025)
>
> Test; will be deleted
> ------------------------------------------------------------------------
>
> There's no indication in the change log what the reverse merges were
> (I had to reverse merge twice, because I used the wrong old version
> first time). Also there are lots of property changes to unrelated
> files (this was apparently related to merge properties).
>
> I don't think I'll use reverse merge again!
>
>> Best regards,
>> Konstantin Kolinko
>>
>> ---------------------------------------------------------------------
>> 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: r1215050 - in /commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src:
main/java/org/apache/commons/jexl2/internal/MethodExecutor.java test/java/org/apache/commons/jexl2/IssuesTest.java
Posted by sebb <se...@gmail.com>.
On 21 December 2011 05:40, Konstantin Kolinko <kn...@gmail.com> wrote:
> 2011/12/17 sebb <se...@gmail.com>:
>> On 16 December 2011 13:33, sebb <se...@gmail.com> wrote:
>>> On 16 December 2011 12:19, henrib <he...@apache.org> wrote:
>>>> I probably used manual editing, otherwise it would be properly reverted...
>>>> If you have the svn command on top of your head to revert to the initial RC3
>>>> version, please send it; I'd rather not f...up again - even better, apply it
>>>> if you still can. :-)
>>
>> Still looking at how to do that; the svn merge command is not behaving
>> quite as I expected in my workspace.
>
> I know two ways to go on if the reverse merge fails
>
> a) Drop current tag and repeat the revision that used to create it
>
> http://svn.apache.org/viewvc?view=revision&revision=1211956
>
That would be the neatest, as svn log would show the same as
previously (apart from the revision of the tag itself).
>
> b) Overwrite wc with fresh copy of old files (it is good that nothing
> was removed or added).
>
> 1. Checkout the tag at the current revision
> 2. Export the tag at revision 1211956 into a new directory (or
> checkout and delete .svn directories).
>
> That is:
>
> svn co https://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/
> mywc
> svn export https://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/@1211956
> myexportdir
>
> 3. Then copy the files over checkout of the tag (myexportdir->mywc).
> 4. Check the result
>>svn st
> M src\test\java\org\apache\commons\jexl2\IssuesTest.java
> M src\main\java\org\apache\commons\jexl2\internal\MethodExecutor.java
>
> 5. Commit.
I suspect the log for the tag will be quite complicated to follow.
Will it show that the two files above are copied from the original tag?
It might be worth trying deleting and recopying the updated files from
the original versions.
That might show the correct provenance; I'll try that in my test tag.
Failing that, I think recreation of the tag from the original branch
revision is the best option, with the log making clear what was done.
Maybe keep the mangled tag, but rename it first.
==
I tried a 3rd option - reverse merge on the two changes, see
http://svn.apache.org/viewvc/commons/proper/jexl/tags/test-ignore/
However that resulted in a very messy change log:
r1221045 | sebb | 2011-12-20 00:26:43 +0000 (Tue, 20 Dec 2011) | 1 line
Changed paths:
M /commons/proper/jexl/tags/test-ignore/BUILDING.txt
after merghe2
------------------------------------------------------------------------
r1221034 | sebb | 2011-12-20 00:11:53 +0000 (Tue, 20 Dec 2011) | 1 line
Changed paths:
M /commons/proper/jexl/tags/test-ignore/BUILDING.txt
M /commons/proper/jexl/tags/test-ignore/src/main/assembly
M /commons/proper/jexl/tags/test-ignore/src/main/config
M /commons/proper/jexl/tags/test-ignore/src/main/java/org/apache/commons/jexl2/introspection/JexlMethod.java
M /commons/proper/jexl/tags/test-ignore/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertyGet.java
M /commons/proper/jexl/tags/test-ignore/src/main/java/org/apache/commons/jexl2/introspection/JexlPropertySet.java
M /commons/proper/jexl/tags/test-ignore/src/main/java/org/apache/commons/jexl2/parser/StringParser.java
M /commons/proper/jexl/tags/test-ignore/src/test/scripts
after merghe
------------------------------------------------------------------------
r1221030 | sebb | 2011-12-19 23:58:49 +0000 (Mon, 19 Dec 2011) | 1 line
Changed paths:
M /commons/proper/jexl/tags/test-ignore/BUILDING.txt
revert edit
------------------------------------------------------------------------
r1221029 | sebb | 2011-12-19 23:58:29 +0000 (Mon, 19 Dec 2011) | 1 line
Changed paths:
M /commons/proper/jexl/tags/test-ignore/BUILDING.txt
edit
------------------------------------------------------------------------
r1221026 | sebb | 2011-12-19 23:56:38 +0000 (Mon, 19 Dec 2011) | 1 line
Changed paths:
A /commons/proper/jexl/tags/test-ignore (from
/commons/proper/jexl/branches/2.0:1221025)
Test; will be deleted
------------------------------------------------------------------------
There's no indication in the change log what the reverse merges were
(I had to reverse merge twice, because I used the wrong old version
first time). Also there are lots of property changes to unrelated
files (this was apparently related to merge properties).
I don't think I'll use reverse merge again!
> Best regards,
> Konstantin Kolinko
>
> ---------------------------------------------------------------------
> 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: r1215050 - in /commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src:
main/java/org/apache/commons/jexl2/internal/MethodExecutor.java test/java/org/apache/commons/jexl2/IssuesTest.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/12/17 sebb <se...@gmail.com>:
> On 16 December 2011 13:33, sebb <se...@gmail.com> wrote:
>> On 16 December 2011 12:19, henrib <he...@apache.org> wrote:
>>> I probably used manual editing, otherwise it would be properly reverted...
>>> If you have the svn command on top of your head to revert to the initial RC3
>>> version, please send it; I'd rather not f...up again - even better, apply it
>>> if you still can. :-)
>
> Still looking at how to do that; the svn merge command is not behaving
> quite as I expected in my workspace.
I know two ways to go on if the reverse merge fails
a) Drop current tag and repeat the revision that used to create it
http://svn.apache.org/viewvc?view=revision&revision=1211956
b) Overwrite wc with fresh copy of old files (it is good that nothing
was removed or added).
1. Checkout the tag at the current revision
2. Export the tag at revision 1211956 into a new directory (or
checkout and delete .svn directories).
That is:
svn co https://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/
mywc
svn export https://svn.apache.org/repos/asf/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/@1211956
myexportdir
3. Then copy the files over checkout of the tag (myexportdir->mywc).
4. Check the result
>svn st
M src\test\java\org\apache\commons\jexl2\IssuesTest.java
M src\main\java\org\apache\commons\jexl2\internal\MethodExecutor.java
5. Commit.
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1215050 - in
/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src:
main/java/org/apache/commons/jexl2/internal/MethodExecutor.java
test/java/org/apache/commons/jexl2/IssuesTest.java
Posted by henrib <he...@apache.org>.
Sorry Sebb, busier w.e. than expected.
Thanks for pushing the release.
--
View this message in context: http://apache-commons.680414.n4.nabble.com/Re-svn-commit-r1215050-in-commons-proper-jexl-tags-COMMONS-JEXL-2-1-RC3-src-main-java-org-apache-coma-tp4204034p4215680.html
Sent from the Commons - Dev mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1215050 - in /commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src:
main/java/org/apache/commons/jexl2/internal/MethodExecutor.java test/java/org/apache/commons/jexl2/IssuesTest.java
Posted by sebb <se...@gmail.com>.
On 16 December 2011 22:59, sebb <se...@gmail.com> wrote:
> On 16 December 2011 13:33, sebb <se...@gmail.com> wrote:
>> On 16 December 2011 12:19, henrib <he...@apache.org> wrote:
>>> I probably used manual editing, otherwise it would be properly reverted...
>>> If you have the svn command on top of your head to revert to the initial RC3
>>> version, please send it; I'd rather not f...up again - even better, apply it
>>> if you still can. :-)
>
> Still looking at how to do that; the svn merge command is not behaving
> quite as I expected in my workspace.
>
>>> Thanks
>>>
>>> PS: What about 2.1.1, do you or do I ?
>>
>> I'm busy at present, probably cannot spare time to do it until Sunday p.m.
>
> Managed to finish the tasks earlier than expected so could perhaps do
> this tomorrow am unless you want to start it sooner.
Since you have not replied, I assume you don't want to do the release.
I'll make a start shortly.
>>> --
>>> View this message in context: http://apache-commons.680414.n4.nabble.com/Re-svn-commit-r1215050-in-commons-proper-jexl-tags-COMMONS-JEXL-2-1-RC3-src-main-java-org-apache-coma-tp4204034p4204379.html
>>> Sent from the Commons - Dev mailing list archive at Nabble.com.
>>>
>>> ---------------------------------------------------------------------
>>> 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: r1215050 - in /commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src:
main/java/org/apache/commons/jexl2/internal/MethodExecutor.java test/java/org/apache/commons/jexl2/IssuesTest.java
Posted by sebb <se...@gmail.com>.
On 16 December 2011 13:33, sebb <se...@gmail.com> wrote:
> On 16 December 2011 12:19, henrib <he...@apache.org> wrote:
>> I probably used manual editing, otherwise it would be properly reverted...
>> If you have the svn command on top of your head to revert to the initial RC3
>> version, please send it; I'd rather not f...up again - even better, apply it
>> if you still can. :-)
Still looking at how to do that; the svn merge command is not behaving
quite as I expected in my workspace.
>> Thanks
>>
>> PS: What about 2.1.1, do you or do I ?
>
> I'm busy at present, probably cannot spare time to do it until Sunday p.m.
Managed to finish the tasks earlier than expected so could perhaps do
this tomorrow am unless you want to start it sooner.
>> --
>> View this message in context: http://apache-commons.680414.n4.nabble.com/Re-svn-commit-r1215050-in-commons-proper-jexl-tags-COMMONS-JEXL-2-1-RC3-src-main-java-org-apache-coma-tp4204034p4204379.html
>> Sent from the Commons - Dev mailing list archive at Nabble.com.
>>
>> ---------------------------------------------------------------------
>> 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: r1215050 - in /commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src:
main/java/org/apache/commons/jexl2/internal/MethodExecutor.java test/java/org/apache/commons/jexl2/IssuesTest.java
Posted by sebb <se...@gmail.com>.
On 16 December 2011 12:19, henrib <he...@apache.org> wrote:
> I probably used manual editing, otherwise it would be properly reverted...
> If you have the svn command on top of your head to revert to the initial RC3
> version, please send it; I'd rather not f...up again - even better, apply it
> if you still can. :-)
> Thanks
>
> PS: What about 2.1.1, do you or do I ?
I'm busy at present, probably cannot spare time to do it until Sunday p.m.
> --
> View this message in context: http://apache-commons.680414.n4.nabble.com/Re-svn-commit-r1215050-in-commons-proper-jexl-tags-COMMONS-JEXL-2-1-RC3-src-main-java-org-apache-coma-tp4204034p4204379.html
> Sent from the Commons - Dev mailing list archive at Nabble.com.
>
> ---------------------------------------------------------------------
> 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: r1215050 - in
/commons/proper/jexl/tags/COMMONS_JEXL_2_1-RC3/src:
main/java/org/apache/commons/jexl2/internal/MethodExecutor.java
test/java/org/apache/commons/jexl2/IssuesTest.java
Posted by henrib <he...@apache.org>.
I probably used manual editing, otherwise it would be properly reverted...
If you have the svn command on top of your head to revert to the initial RC3
version, please send it; I'd rather not f...up again - even better, apply it
if you still can. :-)
Thanks
PS: What about 2.1.1, do you or do I ?
--
View this message in context: http://apache-commons.680414.n4.nabble.com/Re-svn-commit-r1215050-in-commons-proper-jexl-tags-COMMONS-JEXL-2-1-RC3-src-main-java-org-apache-coma-tp4204034p4204379.html
Sent from the Commons - Dev mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org