[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
hg problem
From: |
Ernst Reissner |
Subject: |
hg problem |
Date: |
Thu, 28 Jul 2016 11:49:05 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 |
Hi all,
I have
address@hidden:~/Octave/octave> hg update
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
no changes found
address@hidden:~/Octave/octave>
so all ok but i also have:
address@hidden:~/Octave/octave> hg heads
changeset: 22194:fee0dca31524
tag: tip
parent: 22192:f591c2c96f28
parent: 22193:1344509a480c
user: Ernst Reissnere <address@hidden>
date: Thu Jul 28 11:31:28 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).
is it normal to have two heads?
and hg export is also non-void.
I think i need a merge but:
address@hidden:~/Octave/octave> hg merge
abort: branch 'default' has one head - please merge with an explicit rev
(run 'hg heads' to see all heads)
address@hidden:~/Octave/octave>
so what happened and what to do????
Help very much appreciated.
Ernst
- hg problem,
Ernst Reissner <=
Fwd: Fwd: hg problem, Ernst Reissner, 2016/07/28