Re: hg view -> shows tip (Rik), @ (jwe), and @default (Mike)

[Mike Miller]

On Sun, Oct 13, 2013 at 09:14:02 -0400, Ben Abbott wrote:
> On Oct 13, 2013, at 9:09 AM, Ben Abbott wrote:
> 
> > Is anyone else seeing this?  If it is just me, any suggestions on how to 
> > fix it?
> > 
> > Ben
> > 
> > <Screen Shot 2013-10-13 at 9.05.22 AM.png>
> 
> 
> The graphic bounced, so ...
> 
> $ hg bookmarks
>    12005245b64537c6852384b033cafd199f20bc13 1:78fd87e624cb
>    366a13bd71d588d89a7db300475b988da3f173db 1:78fd87e624cb
>    83425e536ce12083461ee06caad4b6ceb37fae66 1:78fd87e624cb
>    96d02808a8819439feb98dee0c3a06de26bd3fd1 1:78fd87e624cb
>    @                         17629:1041402d8f7f
>    @default                  17647:ca9a9c0740c5
>    c728c87f43ba9a7d0587ce091c4e7cfc0e974fc3 1:78fd87e624cb
>    dev                       13689:b68d95054947

Hi Ben,

Here's what I see (pruned to just show the crucial bits):

$ hg heads

changeset:   17646:993ea21b7e03
tag:         tip
[...]

changeset:   17577:c702371ff6df
branch:      classdef
[...]

changeset:   17112:eff3d78367f0
branch:      stable

$ hg book
   @                         17644:ca9a9c0740c5

I honestly have no idea what those extra hash-string-looking bookmarks
are on your end, but the repo only has "@". I'm not 100% sure, but I
think "@default" is made when you have a different "@" from what the
remote repository named "default" has. If you don't need any of those
bookmarks, you can just delete them all and pull again and you should
see only "@".

It seems we're all still adapting to this bookmark scheme, so sometimes
"@" doesn't get pushed to the head of the default branch, as is the case
right now. Here's how I work:

$ hg pull
$ hg heads

There should be one head for each branch: default, classdef, and stable.
I look at the head revision of the default branch, see if it has the "@"
bookmark on it or not, and then do either

$ hg update @

or

$ hg update default

When I push to default, I make sure to adjust my local copy of "@" to be
on the head revision

$ hg book -f @

And then I push that to the main repository:

$ hg push -r @ default

I hope that makes sense (and hopefully is correct!),

-- 
mike