[Phpmyadmin-devel] new ChangeLog and backported fixes

[Marc Delisle]

Ok, this means that when I commit a fix to trunk, I must plan at the 
same time to see if this fix will be backported, and mention it only in 
the section describing the first release (here 2.10.1) where the fix 
appears.

Or, if the backport was not planned, I come back and move the line later.

It should be doable :)

Marc

Sebastian Mendel a écrit :
> Marc Delisle schrieb:
>> Hi,
>> Let's say I fix something in trunk (for 2.11) then backport in 
>> branches/QA_2_10 (for 2.10.1).
>>
>> Should I mention the fix in both ChangeLogs ?
> 
> i think yes
> 
> trunk changelog will like this
> 
> ###################################################
> 2.11 (not realeased yet)
> ----
> 
>  + ...
>  + ...
> 
> 2.10.1 (not realeased yet)
> ----
> 
>  + your new fix added after 2.10 here
> 
> 2.10.1
> ====
> 
>  ...
> 
> ###################################################
> 
> 
> 
> 2.10 branch changelog
> 
> ###################################################
> 2.10.1  (not realeased yet)
> ----
> 
>  + your new fix added after 2.10 here
> 
> 2.10.1
> ====
> 
>  ...
> 
> ###################################################
> 
> or?
> 
> 
>