[Uml-devel] CVS requires branching

[Cesar Sanchez]

On Saturday 25 May 2002 02:19, you wrote:
> Hi,
>
> I haven't gotten time for making a file loading/saving patch, I think I
> will be able to do it this sunday.
>
> I think we have a little problem with the way CVS is being managed, If we
> want to stabilize the uml for a release, we cannot stop new feature
> development. As an example my friend Cesar has a patch for bare
> state/activity diagram support and he doesn't know what is going to happen
> with it before release date, as time goes by it will be harder for him to
> apply the patch.
>
> I suggest we create a new branch release 1.1 (or some other version) to
> work on stability and then keep adding new features to the
> main(development) branch as in figure below. If a bug is fixed in the
> release branch then it needs to be fixed in the main branch. After
> releasing if a bug is fixed, a patch can be created against the release
> branch and published at sourceforge. As an example of this, a few weeks ago
> I fixed a bug "Galina A. Fyodorova" <fga at infolada.com> reported about uml
> v1.0.3 not supporting russian names for umlobjects and umlviews; I fixed
> the problem into CVS but I couldn't make a patch against v1.0.3, so I
> really didn't help that person.
>
> CVS Structure:
>                        				  /Release 1.1
> 					/
> Devel Branch                                        /
> --------------------------------------------------------------------
>                                 \
>                                  \Release 1.0.3
>
> Regards,

Hello all,

This is a graph of the proposed CVS structure:

DB = Devel Branch
R1.1 = Release 1.1
R1.0.3 = Release 1.0.3

                      R1.1 -------->
                     /
                    /
DB --------------------------->
          \
           \
            R1.0.3 ------------->

Regards,

Cesar