commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Konstantin Kolinko <knst.koli...@gmail.com>
Subject 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
Date Wed, 21 Dec 2011 05:40:46 GMT
2011/12/17 sebb <sebbaz@gmail.com>:
> On 16 December 2011 13:33, sebb <sebbaz@gmail.com> wrote:
>> On 16 December 2011 12:19, henrib <henrib@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


Mime
View raw message