Geek asks and answers

Need help with mercury branching structure

We just switched from SVN to HG and discussed branching structures. We have come up with the following structure, we need some reviews and want to know if problems may arise in the future.

                  * Tag v1.2.0
                  |
                  * Merge Branch v1.2.0 into Default 
                 /|
                / | 
               *  |
               |\ |
Merge v1.1.2   | \| 
 fixes into    |  * Tag v1.1.2
 v1.2.0 branch |  |
               |  * Merge Branch v1.1.2 into Default
               |  |\
               |  |  \
   Commit code *  |   * Commit a bug fix
               |  |   |
               |  |   |
Merge v1.1.1   *  |   * Branch v1.1.2
 fixes into    |\ |  /
 v1.2.0 branch | \| /
               |  * Tag v1.1.1
               |  |
               |  * Merge Branch v1.1.1 into Default
   Commit code *  |\
               |  |  * Commit a bug fix
               |  |  |
 Branch v1.2.0 *  |  * Branch v1.1.1
                \ | /
                 \|/
                  * Tag v1.1.0
  • Each tag represents a release version.
  • Bug fixes occur only on v0.0.x branches
  • Minor improvements and minor new features (cosmetic updates for the user interface, etc.) occur only on branches v0.xx
  • The default scan (in the center) always has a stable and verified code.

Questions:

  • After merging v1.2.0 into the default branch, can we create a branch for v1.1.3 from v1.1.2 tag and relase / tag v1.1.3?
  • - , / ?

:. , Lasse V. Karlsen, , , , v1.2.0 v1.1.3. v1.2.0, , v1.1.2 v1.1.x. , . .

!

+3
1

1.1.3 , :

  • , 1.1.2
  • 1.1.3
  • 1.1.2 , , 1.2,
  • 1.1.3
  • , 1.2.x

Caveat. , , , , .hgtags , 1.1.3 1.2.0. ( ), , . , , 1.1.3 1.2.0 ( ).

: https://lassevk.kilnhg.com/Repo/StackOverflow/answers/SO6071322

:

                  * Merge Branch 1.1.3 into Default
                  |\
                  | \
                  |  * Tag v1.1.3
                  |  |
                  |  * Merge Branch v1.1.3 into 1.1.x Default 
                  |  |\
                  |  | \
Tag v1.2.0        *  |  * Commit a bug fix
                  |  |  |
                  |  |  |
Merge Branch      *  |  * Branch v1.1.3
v1.2.0 into      /|  | /
Default         / |  |/
               *  |  +
               |\ | /
Merge v1.1.2   | \|/ 
 fixes into    |  * Tag v1.1.2
 v1.2.0 branch |  |
               |  * Merge Branch v1.1.2 into Default
               :  :

, , , Mercurial.

+3

More articles:


All Articles