Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>If this was my tree and it hasn't been pushed anywhere, I'd (assuming an empty patch queue and MQ enabled):</p> <pre><code>hg qimport -g -r B: # import revisions B and later into mq as "git" style patches hg qpop -a # unapply them all hg qpush --move C # Apply changes in C (--move rearranges the order) hg qpush --move D # Apply changes in D hg qfin -a # Convert C &amp; D back to changesets hg push &lt;release server&gt; # Push them out to the release branch </code></pre> <p>Then you can <code>hg qpush -a; hg qfin -a</code> to get B &amp; E back into changesets. </p> <p>Final Result:</p> <pre><code>---A---C---D---B---E </code></pre> <p>Advantages:</p> <ul> <li>Nobody needs know you didn't do things in this order to start with (evil grin)</li> <li>You could modify any of the change-sets whilst doing this</li> </ul> <hr> <p>Alternatively, with graft in 2.0:</p> <pre><code>hg update -r A # Goto rev A (no need to do anything special for A) hg graft C # Graft C on to a new anonymous branch hg graft D # Graft D </code></pre> <p>This will give you</p> <pre><code>---A---B---C---D---E \ --C'--D' &lt;-You are here </code></pre> <p>An <code>hg push -r D'</code> should just push the new, cherry-picked, head.</p> <p>You can then <code>hg merge</code> to get one head again with B and E included.</p> <p>Advantages:</p> <ul> <li>Non destructive, so true history is kept, and no chance of loss if you muck up</li> <li>hg tags the new changesets with the hash of the original version, so totally trackable</li> <li>Probably a little simpler.</li> </ul>
    singulars
    1. This table or related slice is empty.
    1. POMercurial: Picking commits to be included in a release
      singulars
      1. PTQuestion
    1. PTAnswer
    1. This table or related slice is empty.
    1. USPaul S
    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. 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
    1. COThanks, this sounds like a good solution, but I am not currently using MQ and haven't really used it before. Given the nature of the the fixes that I need to apply I am considering reverting back to rev A, and reapplying my fixes as indicated by the first answer by @Ry4an since it sounds like the easiest way to go about it.
      singulars
      1. PO
      1. USomarello
    2. COIf you're not comfortable with MQ consider the second solution I give with graft. You could use graft to create the anonymous branches Ry4an talks about. `update A; graft C; update A; graft D; update A; graft E` and you've have your branches and no redoing the changes.
      singulars
      1. PO
      1. USPaul S
 

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