StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>You can't do it. Once you've pulled (and fetch is just pull + either update or merge) there is no record of what you had before the pull and what you just got from the pull.</p> <p>You should do <code>hg incoming</code> before you pull to see what you will get.</p> <p>Also, stop using <code>fetch</code>. The acts of pulling and updating and merging are completely separate and doing them in a single commands provides inadequate error reporting and just confuses things. The command is disabled by default and there's talk of removing it entirely. Merging <em>is</em> coding, and it shouldn't be hidden.</p> <p><strong>Expanding to Show cases you can't cover</strong></p> <p>If before fetching your history is this:</p> <pre><code>[A]-[B]-[C] </code></pre> <p>and you (against all advice) <code>fetch</code> and get <code>[D]</code> you now have:</p> <pre><code>[A]-[B]-[C]-[D] </code></pre> <p>And you can see exactly what's new with:</p> <pre><code>hg diff -r tip-1 </code></pre> <p>or with:</p> <pre><code>hg diff -r "parent(tip)" </code></pre> <p>But if starting again with A,B,C you fetch and get D,E yielding this:</p> <pre><code>[A]-[B]-[C]-[D]-[E] </code></pre> <p>there is no command you can run to see "what changed" without having previously written <code>[C]</code> down on a post it note.</p> <p>If, on the other hand your repo started out looking like this:</p> <pre><code>[A]-[B] \ -[C] </code></pre> <p>and after fetching you have this:</p> <pre><code>[A]-[B]-[D] \ -[C]-[E] </code></pre> <p>there's no single command that will tell you "what changed". Similarly, if before pulling your repo looked like this:</p> <pre><code>[A]-[B]-[C] </code></pre> <p>and after fetching you got this:</p> <pre><code>[A]-[B]-[C]-[E]-[F] \ / -[D]-------/ </code></pre> <p>where <code>[F]</code> is the new ill-advised auto-merge changeset fetch created then the command:</p> <pre><code>hg diff -r C </code></pre> <p>will tell you what's new, but there's no way to look up 'C' without having previously written it down.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

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