[Phpmyadmin-devel] CVS tags and branches [was: Re: 2.7.1 roadmap]

[Marc Delisle]

Michal Čihař a écrit :
> Hi
> 
> I meant just tag names, to conform PEAR. The structure is up to us.
> Well I'd anyway prefer using something else what support branches
> better than CVS as CVS sucks in this field, especially in merging
> changes across branches.
> 
> I'd suggest to use following:
> 
> HEAD
>  - QA_2_7_0 (branch)
>    - RELEASE_2_7_0 (tag)
>    - MAINT_2_7_0 (optional, branch point is RELEASE_2_7_0)
>       - RELEASE_2_7_0_1 (former 2.7.0-pl1)
>       - RELEASE_2_7_0_2 (former 2.7.0-pl2)
>    - RELEASE_2_7_1 (tag)
>    - MAINT_2_7_1 (optional, branch point is RELEASE_2_7_1)
>  - QA_2_8_0 (branch)
>    - RELEASE_2_8_0 (tag)
>    - MAINT_2_8_0 (optional, branch point is RELEASE_2_8_0)
>    - RELEASE_2_8_1 (tag)
>    - MAINT_2_8_1 (optional, branch point is RELEASE_2_8_1)
> 
> And so on.
> 

- QA_2_8 (branch, created from HEAD when 2.8 is feature frozen)
   - RELEASE_2_8_0RC1 (tag) phpMyAdmin-2.8.0rc1
   - RELEASE_2_8_0 (tag)    phpMyAdmin-2.8.0
   - RELEASE_2_8_0_1 (tag)  phpMyAdmin-2.8.0.1 (was pl1)
   - RELEASE_2_8_0_2 (tag)  phpMyAdmin-2.8.0.2 (was pl2)
   - RELEASE_2_8_1RC1 (tag) phpMyAdmin-2.8.1rc1   (no new features in 
the 2.8 branch)
   - RELEASE_2_8_1 (tag)    phpMyAdmin-2.8.1

- QA_2_9 (branch, created from HEAD when 2.9 is feature frozen)
   - RELEASE_2_9_0 (tag)
   - RELEASE_2_9_0_1 (tag)
   - RELEASE_2_9_1 (tag)

I don't see the need for MAINT structure.
Branch/Tag names match with file names.

Marc