Creating a patch branch from a tag and merging with a connector

Now we do the work in the branches . They unite in the body and are killed when functions are performed in them. Thus, trunk always contains the latest stable code.

When the trunk is ready for release, the tag created from trunk at this given point. Now, what is the best way to handle the situation where we need to create a patch for the previous version?

We mark the tag marking this release. But the trunk now contains much more new features. If we create a branch from the old tag, how can we get patch fixes in our trunk , and also mark a new patch release with a new tag?

Can I tag the branch created from the start tag of the release and reintegrate the merge branchwith our torso ? Or will it be a problem? I feel this may confuse Subversion.

This "drawing" is trying to illustrate the flow.

Work branches /-- itter. 1.0 --\      /- 2.0 -\           /------ 3.0 ----------\
             /                  \    /         \         /                   /   \
    ------------trunk----------------------------------------------------------------------  
                                  |                | v2.0 tag              /      | v3.0 tag  
                                  |                                       /
                                  | V1.0 tag----------\                  /
                                                       \-- Branch 1.1 --/
                                                                        |
                                                                        | V1.1 tag

Please note that even if the tags and branches are on the same lines here, they are actually in the standard folder , branches, tags .

Note: work branches should not have any relation to this version. I just called them 1.0, etc. But they could be called foo, bar, or something else.

+3
2

, , , .

+1

, (1.x, 2.x,...) .

.

        1.0     1.1         2.0     2.1         (release tags)
       /       /           /       /
   /----------- 1.x       /----------- 2.x      (release branches)
  /                      / 
----------------------------------------------- trunk

, , ​​(, ).

+2

All Articles