Re: hg problem

[John W. Eaton]

On 07/28/2016 04:52 PM, Ernst Reissner wrote:
> 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.

No, we have two branches.  The one marked stable is for the stable 
release series.  Unless you are fixing a bug, you shouldn't be doing 
anything with that.  Just work on the other one (default).

jwe