Databases
StackOverflow2013
Postsdbo
PO
 

Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <blockquote> <p>Note that I didn't make any local changes. Is <code>bzr pull</code> the recommended way?</p> </blockquote> <p>Yes, it sounds like <code>bzr pull</code> is the appropriate command for your use. <code>pull</code> takes a remote source branch and copies any changes from it to a local destination branch at an older revision. (I use "remote" and "local" here to mean "source" and "destination." Any two branches will do, even two local branches.)</p> <pre><code>remote: A --&gt; B --&gt; C --&gt; D \ \ (branch) (pull) \ \ local: \--&gt; A (no change) \--&gt; D </code></pre> <p>A <code>pull</code> only works if the two branches haven't diverged, i.e., if the revision of the destination is an old revision of the source. <code>push</code> is just the opposite operation: it copies changes in a local branch to remote branch at an older revision.</p> <pre><code>remote: A (no change) --&gt; C \ / (branch) (push) \ / local: \--&gt; A --&gt; B --&gt; C </code></pre> <p>A <code>merge</code> is used when you want to copy changes to a local branch that has diverged from the remote branch.</p> <pre><code>remote: A --&gt; B --&gt; C --&gt; D \ \ (branch) (merge) \ \ local: \--&gt; A --&gt; X --&gt; Y --&gt; Z </code></pre> <p>Here, <code>Z</code> includes all of the changes from <code>D</code> and the changes from <code>Y</code>. A <code>pull</code> is not possible in this case. Note that you must <code>commit</code> after a <code>merge</code> in order to save the new merged revision, whereas a pull automatically brings the branch to a saved revision point. </p> <p>A <code>checkout</code> allows you to use bzr in a mode that is similar to CVS/SVN: the local branch will be "attached" to a remote branch; <code>commit</code>s will be automatically <code>push</code>ed; if the remote branch has diverged, the commit will fail; an <code>update</code> is just a <code>merge</code> from the "attached" remote branch.</p>
    singulars
    1. This table or related slice is empty.
    1. PObzr pull vs bzr merge
      singulars
      1. PTQuestion
    1. PTAnswer
    1. USChris Conway
    1. USChris Conway
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PObzr pull vs bzr merge
      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. CONice ascii art, thanks. What's unclear to me, is why `merge` causes conflicts even if there's no local change?
      singulars
      1. PO
      1. USWei Hu
    2. CODo you get conflicts even on the first `merge`, or only after you've `merge`d more than once? Do you `commit` after each `merge`? The merging algorithm is complicated, and what it can and can't resolve without conflicts is often surprising.
      singulars
      1. PO
      1. USChris Conway
    3. COAfter I've `merge`d more than once. I didn't `commit` after each `merge`. This all makes sense now.
      singulars
      1. PO
      1. USWei Hu
 

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