Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>The basic problem here is that your working directory is not clean. Mercurial prevents people from accidentally jumping between branches with uncommitted changes as this is generally a bad idea.</p> <p>Let's start with that first command:</p> <pre><code>$ hg update tip abort: crosses branches (merge branches or use --clean to discard changes) </code></pre> <p>This is telling you two important things:</p> <ul> <li>you're trying to cross branches</li> <li>you have uncommitted changes</li> </ul> <p>And that you have two options:</p> <ul> <li>merge</li> <li>use hg update --clean to lose your changes</li> </ul> <p>So what are your changes? The first step is to run 'hg status'. As you say 'hg status outputs many files prepended by 1 or ?'. Well those '1s' are actually '!' indicating deleted/missing files (get a better font!). You should doublecheck against summary, which will give you output like this:</p> <pre><code>parent: 15200:fa6f93befffa patch: use more precise pattern for diff header color styling (issue3034) branch: default commit: 1 deleted, 1 unknown (clean) &lt;- your changes update: (current) </code></pre> <p>If you try to merge at this point, you'll get a message like:</p> <pre><code>$ hg merge stable abort: outstanding uncommitted changes (use 'hg status' to list changes) </code></pre> <p>If you have changes other than missing files, you'll want to consider committing them.</p> <p>If these missing files are your only changes, it's probably ok to discard them:</p> <pre><code>hg revert -a </code></pre> <p>After you've done that, you're in a state where Mercurial will let you update or merge without complaining.</p> <p>Finally, you say "hg status output many files from other projects since it starts at .. The file I added is the only file that should get added.". This is a basic misunderstanding of how Mercurial works. Unlike CVS or SVN, <strong>there is only one project</strong> as far as Mercurial is concerned and actions (commit/update/merge/status) work on the entire project tree at once. Subdirectories are not independent projects with separate histories.</p>
    singulars
    1. This table or related slice is empty.
    1. POMercurial usage to merge multiple heads
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USmpm
    1. USmpm
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. POMercurial usage to merge multiple heads
      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. VTAcceptedByOriginator
    3. VO
      singulars
      1. PO
      1. This table or related slice is empty.
      1. VTUpMod
    1. This table or related slice is empty.
 

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