[Octave-bug-tracker] problem with bookmarks

[Michael D. Godfrey]

I just got

[pbdsl3:octave] hg -v pull
real URL is http://hg.savannah.gnu.org/hgweb/octave
pulling from http://www.octave.org/hg/octave
searching for changes
adding changesets
adding manifests
adding file changes
added 7 changesets with 14 changes to 14 files (+1 heads)
divergent bookmark @ stored as @default
(run 'hg heads' to see heads, 'hg merge' to merge)
[pbdsl3:octave] hg -v update
abort: crosses branches (merge branches or update --check to force update)


[pbdsl3:octave] hg heads
changeset:   17452:56e72e8d1aba
bookmark:    @default
tag:         tip
user:        Rik <address@hidden>
date:        Thu Sep 19 17:18:16 2013 -0700
summary:     contourc.m: Code special case for meshgrid input (30X 
performance increase).

changeset:   17445:e7378124ed78
bookmark:    @
tag:         qbase
tag:         qtip
tag:         tex-symbols-upd
user:        Michael Godfrey <address@hidden>
date:        Thu Sep 19 20:46:08 2013 -0400
summary:     sort TeX names to facilitate additions