Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>VonC has <a href="https://stackoverflow.com/questions/2672351/hg-how-to-do-a-rebase-like-gits-rebase/2672429#2672429">the answer you're looking for</a>, the Rebase Extension. It is, however, worth spending a second or two thinking about why neither mq nor rebase are enabled by default in mercurial: because mercurial is all about indelible changesets. When I work in the manner you're describing, which is nearly daily, here's the pattern I take:</p> <pre><code>1. Start working on a new feature: $ hg clone mainline-repo newfeature-123 do a few commits (M, N, O) master A---B---C \ newfeature-123 M---N---O 2. Pull new changes from upstream mainline: $ hg pull master A---B---C---D---E---F \ newfeature-123 M---N---O 3. merge master into my clone so that my new feature can be developed against the latest upstream changes: (from newfeature-123) $ hg merge F master A---B---C---D---E---F \ \ newfeature-123 M---N---O---P </code></pre> <p>and that's really all that's necessary. I end up with a newfeature-123 clone I can easily push back to the mainline when I'm happy with it. Most importantly, however, I <em>never changed history</em>. Someone can look at my csets and see what they were originally coded against and how I reacted to changes in the mainline throughout my work. Not everyone thinks that has value, but I'm a firm believer that it's the job of source control to show us not what we wished had happened, but what actually happened -- every deadend and every refactor should leave an indelible trace, and rebasing and other history editing techniques hide that.</p> <p>Now go pick VonC's answer while I put my soapbox away. :)</p>
    singulars
    1. This table or related slice is empty.
    1. POHg: How to do a rebase like git's rebase
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USCommunity
    1. USRy4an Brase
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POHg: How to do a rebase like git's rebase
      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. CO+1 for the indelible changeset.
      singulars
      1. PO
      1. USVonC
    2. CONote: off course, Git does not *exactly* allow you to rewrite history, only to create new one easily (http://utcc.utoronto.ca/~cks/space/blog/tech/GitNewHistory). By adding the RebaseExtension, Mercurial provides the same exact convenient way to replace an old history by a new one. Why? Because a merge is not always the right answer, especially when your changeset should be viewed as *evolutions* on top of F, and not the reverse (P merged on top of O)
      singulars
      1. PO
      1. USVonC
    3. COVonC, I agree, a merge isn't always the right choice, but I think the difference in is what one wants one's VCS history to be able to tell them. I think the history should _always_ be able to answer questions like "What was that way I tried to integrate it at first that didn't work out and I thought was useless at the time". Scientists keep logbooks in pen with numbered pages, and AFAIC software engineers should save every byte they've ever typed. Rewriting history, even cset parentage, but certainly CollapseExtension, HistEdit, etc. violate that. It's totally a matter of personal choice.
      singulars
      1. PO
      1. USRy4an Brase
 

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