Databases
StackOverflow2013
Postsdbo
PONeed help with mercurial branching structure
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PONeed help with mercurial branching structure
    text
    copied!<p>We have just switched from SVN to HG and discussing on branching structures. We have came up with the following structure, need some reviews and want to know if this structure cause problems in the future.</p> <pre><code> * 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 </code></pre> <ul> <li>Each tagging represents a version release.</li> <li>Bug fixes happen only on v0.0.x branches</li> <li>Minor improvements and minor new features (cosmetic updates to the UI, etc.) happen only on v0.x.x branches</li> <li>The default branch (center) has always stable and tested code</li> </ul> <p>Questions:</p> <ul> <li>After merging v1.2.0 into default branch, will we able to create a branch for v1.1.3 from tag v1.1.2 and relase/tag v1.1.3?</li> <li>Does this structure a valid structure or are we trying to come up something absurd and there is already a solution/answer to this?</li> </ul> <hr/> <p><strong>UPDATE:</strong> After discussing the solution provided by Lasse V. Karlsen, we have finally agreed that we won't need to release v1.1.3 after releasing v1.2.0. Our users should update to v1.2.0 line if they want to receive updates and v1.1.2 will be the last update for v1.1.x line. So, this way the first question is eliminated. Thanks for the great advise and tip Lasse.</p> <p>Thank you all!</p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload