Sanjeeb Kumar Sahoo wrote:
> Jerome,
>
> Jerome Dochez wrote:
>> 5. After the release, all changes from the branch will be merged back
>> to cvs trunk.
>>
>> The main trunk is open for GlassFish v2 (SJSAS 9.1) checkins.
>>
>>
>> Bug handling
>>
>> 1. A bug should always be fixed on the trunk (9.1) first and then
>> backported into UR1
> First you mentioned that the changes from the branch will be merged
> back to CVS trunk and then you mentioned that a bug must be fixed in
> trunk first. If later is the case, then what is the need for a merge?
right, I messed up the email language, 5 do not apply. You should fix in
the trunk first and then in the FCS branch, and since there is no
automatic merge from the branch to the trunk you need to manually
check-in in both places.
Jerome
>
> Thanks,
> Sahoo