commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebb <seb...@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 11:47:22 GMT
On 21 December 2011 11:27, sebb <sebbaz@gmail.com> wrote:
> On 21 December 2011 05:40, Konstantin Kolinko <knst.kolinko@gmail.com> wrote:
>> 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
>>
>
> 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


Mime
View raw message