Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>I can see two possibilities (taking into account Martin's answer where you are advised to keep <code>default</code> as your main development branch).</p> <p>One Martin has already covered, whereby the first thing you do in a new repository is "initial setup". Typically this may include your standard template <code>.hgignore</code> file. Incidentally I find this to be a better option than...</p> <p>The other option if you have already committed to another named branch is to update to the <code>null</code> changeset (empties your working directory), then <code>merge</code> into it. This creates a branch called "default".</p> <p>First we'll do some work on a development branch:</p> <pre><code>C:\tmp\test&gt;hg init . C:\tmp\test&gt;hg branch devbranch marked working directory as branch devbranch C:\tmp\test&gt;echo something &gt; out.txt C:\tmp\test&gt;hg add . adding out.txt C:\tmp\test&gt;hg commit -m "some work" C:\tmp\test&gt;hg log changeset: 0:4631a4a10552 branch: devbranch tag: tip summary: some work </code></pre> <p>Here we have a single commit on our <code>devbranch</code> branch. When the work is complete (which fortuitously in this case, it is), we want to merge the work back into our (non-existent) <code>default</code> branch. So we update to <code>null</code> prior to doing the merge:</p> <pre><code>C:\tmp\test&gt;hg update null 0 files updated, 0 files merged, 1 files removed, 0 files unresolved C:\tmp\test&gt;hg merge devbranch 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) C:\tmp\test&gt;hg commit -m "merged" C:\tmp\test&gt;hg log changeset: 1:55e879b67c69 tag: tip parent: -1:000000000000 parent: 0:4631a4a10552 summary: merged changeset: 0:4631a4a10552 branch: devbranch summary: some work C:\tmp\test&gt;hg branches default 1:55e879b67c69 devbranch 0:4631a4a10552 (inactive) </code></pre> <p>As you can see, the branch <code>default</code> is created with the first changeset on that branch having two parents, <code>-1</code> and <code>0</code>. After this you would just update to the tip of the <code>default</code> branch when you wanted to merge in - the <code>hg update null</code> would only be done the first time.</p>
    singulars
    1. This table or related slice is empty.
    1. POKeeping the default branch when first commit is to another branch
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USicabod
    1. USicabod
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POKeeping the default branch when first commit is to another 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. VTAcceptedByOriginator
    1. COI'm accepting this since it is a more literal answer to my question. I agree with Martin that in practice we're likely to have some boilerplate, config files, README, etc. that we will commit into the default branch before working on features. But it's nice to know that we don't have to do in order to be able to merge into default later.
      singulars
      1. PO
      1. USMatthew Gertner
    2. COI'm glad you could use this answer! I was a bit in doubt about what you really wanted when I wrote mine. You can also just create the default branch with `hg branch default`... as far as I can see, there's no need to update to `null` and do a funky merge :-) Normal changesets have `null` as their second parent. Merge changesets have two non-`null` changesets as parents. You've created a normal changeset with `null` as first parent. The result is really not different from doing `hg branch default` followed by `hg commit`.
      singulars
      1. PO
      1. USMartin Geisler
    3. COAh ok. I didn't like the fact that the default branch ends up with a non-null parent after `hg branch default`. But of course that's the case after merging with null also. Anyway, I learned a bit more about hg from this discussion, which is awesome. In practice I'm sure we'll just make sure we land something in default before branching.
      singulars
      1. PO
      1. USMatthew Gertner
 

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