Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>You would not be able to retroactively introduce 1.1.3 as a changeset along the default timeline, the best you can hope for is as follows:</p> <ol> <li>Update back to default at the point where you released 1.1.2</li> <li>Branch out for 1.1.3 and commit</li> <li>Merge this with the 1.1.2 tag in default, this will create another head on default branch, parallel to the 1.2 timeline you're now working on</li> <li>Tag for 1.1.3 and release</li> <li>Merge this new head into previous head, getting the bugfix into 1.2.x</li> </ol> <p><strong>Caveat</strong>: One thing that I discovered when I tested this is that <code>.hgtags</code> had to be merged when I merged the 1.1.3 default content into the 1.2.0 default content. Since tags are always read from the tipmost changeset (I could be wrong here), this might indicate that this is not the best way to do this. At the very least I would perhaps wait with the tagging until I had merged 1.1.3 into the 1.2.0 timeline (ie. topmost merge in diagram below.)</p> <p>My test repository can be found here: <a href="https://lassevk.kilnhg.com/Repo/StackOverflow/answers/SO6071322" rel="nofollow">https://lassevk.kilnhg.com/Repo/StackOverflow/answers/SO6071322</a></p> <p>It would look something like this:</p> <pre> * Merge Branch 1.1.3 into Default |\ | \ | * Tag v1.1.3 | | | * Merge Branch v1.1.3 into 1.1.x Default | |\ | | \ Tag v1.2.0 * | * Commit a bug fix | | | | | | Merge Branch * | * Branch v1.1.3 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 : : </pre> <p>Whether or not this is a good idea, not sure, I've yet to manage a project with lots of parallel releases like this in Mercurial.</p>
    singulars
    1. This table or related slice is empty.
    1. PONeed help with mercurial branching structure
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USLasse Vågsæther Karlsen
    1. USLasse Vågsæther Karlsen
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PONeed help with mercurial branching structure
      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. VTAcceptedByOriginator
    1. COIs it better if we had separate branches going on for each version and tag releases on those branches instead of default branch? That way, we would be able to continue from where we left for older versions.
      singulars
      1. PO
      1. USmatte
    2. COIf you see my edit (Caveat), then yes, that might not be the worst idea. However, what you really should do is post this question on the mercurial mailing list, you probably don't need to copy the entire question either, just the text of it, and reference this question here. The mailing list is at mercurial@selenic.com
      singulars
      1. PO
      1. USLasse Vågsæther Karlsen
    3. COAdded a link to my test repository: https://lassevk.kilnhg.com/Repo/StackOverflow/answers/SO6071322
      singulars
      1. PO
      1. USLasse Vågsæther Karlsen
 

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