On 4/1/13 6:54 AM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote:
> Well, for 2, during the time we merge the release, this release is superset
> of the master, once tagged, they become equals but that's a detail.
Right, this rule set only applies because we don't have an active release
branch.
>
> And finally, I guess your logic is good, from what said Justin, the KEY at a
> upper level in the directory hierarchy would superset the one in a lower
> one, is that correct ?
I'm not sure I understood that, but it is reasonable to make sure
release/flex/KEYS contains the latest set of keys. But I think we should do
that by copying from the KEYS in develop or trunk.
>
> -Fred
>
> -----Message d'origine-----
> From: Alex Harui
> Sent: Monday, April 01, 2013 3:28 PM
> To: dev@flex.apache.org
> Subject: Re: svn commit: r1699 - /release/flex/KEYS
>
> Justin is right that release branch could be behind. So, I think what
> should be the case is that:
>
> 1) develop branch is equal to or superset of release branch.
> 2) trunk/master is equal to release branch
> 3) release/flex/KEYS === develop branch.
>
> Please check my logic.
>
> -Alex
>
>
> On 4/1/13 1:57 AM, "Frédéric THOMAS" <webdoubl...@hotmail.com> wrote:
>
>> My key appears only in the sdk/develop because I checked it in the 9th of
>> March, so, depending the policy, either I wait for the next release to
>> copy
>> the sdk/release/KEY file to the release/flex/KEYS or I copy it from the
>> develop branch, as you like guys.
>>
>> -Fred
>>
>> -----Message d'origine-----
>> From: Justin Mclean
>> Sent: Monday, April 01, 2013 10:50 AM
>> To: dev@flex.apache.org
>> Subject: Re: svn commit: r1699 - /release/flex/KEYS
>>
>> Hi,
>>
>>> In theory, the release branch got merged to develop branch and trunk, so
>>> KEYS files in all places should match.
>> No the release branch could be behind the develop branch. The develop
>> branch
>> KEYS may of contained extra info at the time 4.9.1 branch was merged.
>>
>> Please don't change the Apache Flex release branch as it represents 4.9.1
>> as
>> released.
>>
>> Perhaps another a git vs svn branch issue or was it a svn merge issue when
>> merging 4.9.1 brach into develop?
>>
>> Thanks,
>> Justin
>>
--
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui
