Re: @ not @ tip

[Daniel J Sebald]

On 11/28/2013 12:40 PM, Jordi Gutiérrez Hermoso wrote:
> On Thu, 2013-11-28 at 11:43 -0600, Daniel J Sebald wrote:
> > (And avoiding the merge conflict is easy using "hg update tip".)
>
> "hg update tip" will take you to whatever commit happens to be the
> highest revision number on your clone. If we spend some time working
> on both the stable and default branch, "hg default tip" may switch you
> back and forth between the two branches, depending which branch has
> the highest revision number. It is because of this that the Mercurial
> devs have deprecated the concept of "tip".
>
> You should instead do "hg up stable" if you want to work on stable or
> "hg update @" if you want to work on where the @ bookmark is (which
> should be the latest default head). If you do a plain "hg update", you
> will be taken to the head of the current branch.
>
> - Jordi G. H.

OK, that helps.  Maybe what is wrong here is that my version of HG is 
just old enough that it doesn't pick the head of the current branch with 
"hg update".  Instead, it seems to recognize there are multiple heads, 
yet to be merged, and gives an error message.

If "tip" is deprecated will it eventually disappear from the Octave web 
log once the server's version of HG is up-to-date?

Dan