Re: extra head

[Ben Abbott]

On Aug 16, 2013, at 1:22 PM, Daniel J Sebald wrote:

Ben, is this the first push you've done since starting to use the bookmarks?

I've pushed a few times since using bookmarks.  I've just pushed another which looked on via "hg view", and looks ok at the link below.

http://hg.savannah.gnu.org/hgweb/octave/graph/2ab5636ee75f

"hg heads" looks good too.

$ hg heads
changeset:   17263:2ab5636ee75f
bookmark:    @
tag:         tip
user:        Ben Abbott  <address@hidden>
date:        Fri Aug 16 13:00:46 2013 -0400
summary:     * scripts/plot/hold.m: Fix typo "vargin" -> "varargin".

changeset:   17112:eff3d78367f0
branch:      stable
parent:      17108:2c76db746701
user:        Jordi Gutiérrez Hermoso <address@hidden>
date:        Tue Jul 30 13:20:58 2013 -0400
summary:     * Makefile.am (doxyhtml): Restore doxyhtml argument in recursive make call

changeset:   16896:498b2dd1bd56
branch:      classdef
parent:      16698:13b3b92ea99c
parent:      16895:b8c37a855074
user:        John W. Eaton <address@hidden>
date:        Thu Jul 04 10:09:58 2013 -0400
summary:     periodic merge of default to classdef

 I think the clue lies in this statement:

divergent bookmark @ stored as @default

Could it be that hg doesn't know what bookmark you are referring to?  So maybe it assumes the bookmark should be associated with the default branch? That is, there is this bookmark that somehow became "divergent".  I wonder how this could become become divergent?

Might it be that the patch you imported was created prior to using the bookmark feature?

No.  The changeset was created a few minutes prior to pushing.

hg pull

hg update -C @

hg import changeset.patch

hg outgoing

hg push ssh://address@hidden/octave

hg rollback

hg revert --all

hg pull

hg update -C @

It might be good to pause here a moment with further pushes.  I see in the log

http://hg.savannah.gnu.org/hgweb/octave/

that John D's latest push now has an @ symbol attached.  I don't recall seeing "default tip @" in the past.  Did Rik's merge perhaps bookmark the tip? Bookmarking the tip doesn't make sense, does it?

I can't claim to be an expert in mercurial, but ... I've been seeing the "default tip @" since I started using bookmarks.  For example, see my "hg id", "hg tip", and "hg log" below.

$ hg id
2ab5636ee75f+ tip @

$ hg tip
changeset:   17263:2ab5636ee75f
bookmark:    @
tag:         tip
user:        Ben Abbott  <address@hidden>
date:        Fri Aug 16 13:00:46 2013 -0400
summary:     * scripts/plot/hold.m: Fix typo "vargin" -> "varargin".

$ hg log | less

changeset:   17263:2ab5636ee75f
bookmark:    @
tag:         tip
user:        Ben Abbott  <address@hidden>
date:        Fri Aug 16 13:00:46 2013 -0400
summary:     * scripts/plot/hold.m: Fix typo "vargin" -> "varargin".

<snip>

and a snippet from "hg view" (which is what I prefer to look at as it provides more info).

Does any of this look unusual? I'm running mercurial version 2.6.3.

Ben