Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>To augment <a href="https://stackoverflow.com/questions/7165989/mercurial-apply-a-bugfix-change-from-stable-named-branch-to-dev-branch/7166508#7166508">Tim's answer</a>, a different way to approach it is how the Mercurial recommend you do it if you can, plan ahead (I'll see if I can rustle up a link.)</p> <p>The plan goes that if you know that a bugfix/change has to go into several branches, you don't commit that changeset into one of those places to begin with, you do it somewhere else.</p> <p>Since you're fixing a bug, somewhere in the history of the project, that bug was introduced.</p> <p>And since the bugfix needs to go into more than one branch, that "somewhere" has to be before the point where you branched, otherwise the bug wouldn't be in both (/all) branches.</p> <p>So, the recommended way is to fix the bug where it was introduced, and then merge that changeset into each of the branches that needs it.</p> <p>Let's look at an example, we have <code>default</code> and <code>stable</code> branches:</p> <pre><code>1---2---3---4---5---6---7---8---9---10 default \ \ \ \ 11--------------12--13 stable </code></pre> <p>Then you discover that changeset 2 introduced a bug, and the bugfix needs to be applied to both <code>default</code> and <code>stable</code>. The way you describe it in the question, it looks like you would do this:</p> <pre><code>1---2---3---4---5---6---7---8---9---10--15 default \ \ /^-- merge stable into default \ \ / 11--------------12--13----14 stable ^-- bugfix </code></pre> <p>But this would merge changeset 13 into <code>default</code> as well. If you don't want that to happen, you would instead do this:</p> <pre><code> v-- bugfix 14--------------------------+--+ / | \ / | \ 1---2---3---4---5---6---7---8---9--x-10--15 default \ \ | ^-- merge 14 into default \ \ | 11--------------12--13--16 stable ^-- merge 14 into stable </code></pre> <p>For more information on how to use Mercurial in bugfixing-scenarios, the <a href="http://hgbook.red-bean.com/read/finding-and-fixing-mistakes.html" rel="nofollow noreferrer">9th Chapter of 'Mercurial: The Definitive Guide'</a> is well worth the read.</p>
    singulars
    1. This table or related slice is empty.
    1. POmercurial: apply a bugfix change from stable named branch to dev branch
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCommunity
    1. USLasse Vågsæther Karlsen
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POmercurial: apply a bugfix change from stable named branch to dev branch
      singulars
      1. PTQuestion
    1. This table or related slice is empty.
    1. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    2. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. COso basically you mean i should create a temporary branch which contains the bug fix and then merge it into both dev and stable branch? well that can happen but wont the bugfix branch 'go away' when i merge it with stable? How do i merge a branch which has already been merged? or will the bigfix branch stay unaffected even after merging it to another branch? personally, i was thinking about going with @Tim's third method.
      singulars
      1. PO
      1. USAchshar
    2. COIt won't be a named branch, just an anonymous branch, but it will still be part of your history, and the history will look exactly like I portrayed in the answer. In other words, if you had the exact history as my answer shows, it would look like the final diagram after the merge, it will not "melt into" either branch and disappear.
      singulars
      1. PO
      1. USLasse Vågsæther Karlsen
    3. COcool so the anonymous branch will live on? or do i manually kill it after merging it to other branches? also how exactly do i create such branches?
      singulars
      1. PO
      1. USAchshar
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

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