Fwd: Fwd: hg problem

[Ernst Reissner]

Update:
I now pulled:


address@hidden:~/Octave/octave> hg pull
pulling from http://www.octave.org/hg/octave
real URL is http://hg.savannah.gnu.org/hgweb/octave
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 4 changes to 4 files (+1 heads)
updating bookmark @
(run 'hg heads' to see heads, 'hg merge' to merge)
address@hidden:~/Octave/octave> hg update
abort: uncommitted changes
(commit and merge, or update --clean to discard changes)
address@hidden:~/Octave/octave> hg merge
abort: heads are bookmarked - please merge with an explicit rev
(run 'hg heads' to see all heads)
address@hidden:~/Octave/octave> hg heads
changeset:   22198:8971508e21c8
bookmark:    @
tag:         tip
user:        John W. Eaton <address@hidden>
date:        Thu Jul 28 16:38:37 2016 -0400
summary:     make figures invisible in publish tests (bug #48556)

changeset:   22196:d821e306c922
parent:      22194:fee0dca31524
parent:      22195:829e0aafebdc
user:        Ernst Reissner <address@hidden>
date:        Thu Jul 28 22:01:19 2016 +0200
summary:     merge

changeset:   22046:de18e547e99d
branch:      stable
parent:      22026:837d7e48c9b4
user:        Rik <address@hidden>
date:        Wed Jul 06 07:55:18 2016 -0700
summary:     Link Z_LIB to liboctinterp (bug #48407).

address@hidden:~/Octave/octave>


I would have merged the tip but the more experienced ones here:
tell me the right workflow.

Ernst

-------- Forwarded Message --------

Subject:	hg problem
Date:	Thu, 28 Jul 2016 22:52:34 +0200
From:	Ernst Reissner <address@hidden>
To:	address@hidden

Hi all,

i face that in my invironment:

address@hidden:~/Octave/octave> hg update
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
address@hidden:~/Octave/octave>


but

address@hidden:~/Octave/octave> hg heads
changeset:   22196:d821e306c922
tag:         tip
parent:      22194:fee0dca31524
parent:      22195:829e0aafebdc
user:        Ernst Reissner <address@hidden>
date:        Thu Jul 28 22:01:19 2016 +0200
summary:     merge

changeset:   22046:de18e547e99d
branch:      stable
parent:      22026:837d7e48c9b4
user:        Rik <address@hidden>
date:        Wed Jul 06 07:55:18 2016 -0700
summary:     Link Z_LIB to liboctinterp (bug #48407).

and hg export is no empty.

I have the impression that I shall add the two heads but i can't.


Help very much appreciated.


Ernst