geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From John Sisson <jrsis...@gmail.com>
Subject Re: Merging 1.1 changes to trunk
Date Thu, 01 Jun 2006 03:22:22 GMT
I'll do your merge.

John

Matt Hogstrom wrote:
> My comments below.  Will you do the merge John or should we do it 
> after you wave the flag ?
>
> Matt
>
> John Sisson wrote:
>> There have been a number of changes in the 1.1 branch that haven't 
>> been merged to trunk since trunk was copied from the 1.1 branch in 
>> rev 409124.
>>
>> We should try to merge these in revision order as much as possible, 
>> as there will be less chance that my svn properties fix (rev 409817) 
>> will have problems merging files that have their eol-style changed.  
>> Please hold off merging any other changes to trunk until we have 
>> merged these ones.
>>
>> Thanks,
>>
>> John
>>
>> 1.1 Change and associated trunk change
>> --------------------------------------
>> http://svn.apache.org/viewvc?rev=409165&view=rev (hogstrom)
>> http://svn.apache.org/viewvc?rev=409166&view=rev (hogstrom)
>
> This was done...is there a followup required ?
>>
>> http://svn.apache.org/viewvc?rev=409179&view=rev (hogstrom)
>> http://svn.apache.org/viewvc?rev=409183&view=rev (hogstrom)
>
> Same here.
>
>>        http://svn.apache.org/viewvc?rev=409201&view=rev (ammulder)
>> http://svn.apache.org/viewvc?rev=409223&view=rev (ammulder)
>>
>> http://svn.apache.org/viewvc?rev=409288&view=rev (kevan)
>> *** Merge required ?? ***
>>
>> http://svn.apache.org/viewvc?rev=409290&view=rev (ammulder)
>> http://svn.apache.org/viewvc?rev=409293&view=rev (ammulder)
>>
>> http://svn.apache.org/viewvc?rev=409292&view=rev (jsisson)
>> Merge not required.
>>
>> http://svn.apache.org/viewvc?rev=409295&view=rev (ammulder)
>> http://svn.apache.org/viewvc?rev=409296&view=rev (ammulder)
>>
>> http://svn.apache.org/viewvc?rev=409305&view=rev (djencks)
>> *** Merge required ?? ***
>>
>> http://svn.apache.org/viewvc?rev=409481&view=rev (hcunico)
>> *** Merge required ?? ***
>>
>> http://svn.apache.org/viewvc?rev=409499&view=rev (hogstrom)
>> *** Merge required ?? ***
>
> Yes a merge should be done.
>
>>
>> http://svn.apache.org/viewvc?rev=409508&view=rev (jsisson)
>> *** Merge required ***
>>
>> http://svn.apache.org/viewvc?rev=409513&view=rev (jsisson)
>> *** Merge required ***
>>
>> http://svn.apache.org/viewvc?rev=409514&view=rev
>> *** Merge required ?? ***
>>
>> http://svn.apache.org/viewvc?rev=409761&view=rev (ammulder)
>> http://svn.apache.org/viewvc?rev=409771&view=rev & 
>> http://svn.apache.org/viewvc?rev=409961&view=rev (ammulder)
>>
>> http://svn.apache.org/viewvc?rev=409817&view=rev (jsisson) This is 
>> the svn properties fix.
>> *** Merge required ***
>>
>> http://svn.apache.org/viewvc?rev=409824&view=rev (gdamour)
>> *** Merge required ?? ***
>>
>> http://svn.apache.org/viewvc?rev=410129&view=rev (djencks)
>> http://svn.apache.org/viewvc?rev=410301&view=rev (djencks)
>>
>> http://svn.apache.org/viewvc?rev=410498&view=rev (jsisson)
>> *** Merge required ***
>>
>> http://svn.apache.org/viewvc?rev=410654&view=rev (kevan)
>> *** Merge required ?? ***
>>
>> http://svn.apache.org/viewvc?rev=410704&view=rev
>> *** Merge required ***
>>
>>
>>
>


Mime
View raw message