Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>There are a lot of great writeups up Mercurial workflows, including:</p> <ul> <li><a href="http://stevelosh.com/blog/2010/02/mercurial-workflows-branch-as-needed/" rel="nofollow noreferrer">http://stevelosh.com/blog/2010/02/mercurial-workflows-branch-as-needed/</a></li> <li><a href="http://stevelosh.com/blog/2010/05/mercurial-workflows-stable-default/" rel="nofollow noreferrer">http://stevelosh.com/blog/2010/05/mercurial-workflows-stable-default/</a></li> <li><a href="https://www.mercurial-scm.org/wiki/StandardBranching" rel="nofollow noreferrer">https://www.mercurial-scm.org/wiki/StandardBranching</a></li> </ul> <p>All of those use <a href="http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/#branching-with-named-branches" rel="nofollow noreferrer">Named Branches</a> very minimally -- definitely not one per feature, which with clones as branches sounds like the work mode you (and I) prefer.</p> <p>Hitting your specific question, if the combination LiveCode+FeatureA+FeatureB is failing tests the the best way to handle it is to just keep repairing FeatureB and then merging those changes down into FeatureA + Feature B. However, before you get to that stage it's a good idea to have QA hit LiveCode+FeatureA and LiveCode+FeatureB separately too, it's slightly more work for them (more test targets) but having each feature in isolation helps find the cause of the defect more quickly.</p> <p>Once LiveCode+FeatureA and LiveCode+FeatureB are passing QA, <em>then</em> you merge them into LiveCode+FeatureA+FeatureB and if that still passes tests merge the whole thing into DefaultStable. There should be no need to <em>remove</em> FeatureB from a LiveCode+FeatureA+FeatureB because you can always just create a new clone of LiveCode and merge in only FeatureA if you want it.</p> <p>Here's a <strong>great</strong> writeup of a Mercurial (Kiln) based QA/release process:</p> <p><a href="http://blog.bitquabit.com/2011/03/10/when-things-go-well/" rel="nofollow noreferrer">http://blog.bitquabit.com/2011/03/10/when-things-go-well/</a></p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

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