Re: regression in eigs

[c.]

On 4 Nov 2013, at 20:25, Jordi Gutiérrez Hermoso <address@hidden> wrote:

> On Mon, 2013-11-04 at 08:56 +0100, c. wrote:
> 
>> I take it back, it seems I can't push the changeset without creating
>> a new head,  
> 
> When this happens, try to pull and rebase your head on top of what you
> just pulled:
> 
>    hg pull --rebase
> 
> Sometimes, depending if you checked out an older revision, this may
> fail. In that case, you can rebase after the fact. First do "hg heads"
> to see what the head that you want to rebase is, and then do
> 
>    # To switch back to @    
>    hg update -r @ --check 
> 
>    # Rebase your head back on top of @
>    hg rebase -b REV_OF_YOUR_HEAD
> 
>    # Advance the @ bookmark to your rebased head
>    # (older hg requires --force here)
>    hg book @ 
> 
> HTH,    
> - Jordi G. H.

Jordi,

This is happening again, but your suggestion does not seem to work.

I want to push the attached changeset an I have the following graph in my local 
copy:

@  changeset:   17979:a4bc3ad4c703
|  bookmark:    @
|  tag:         tip
|  user:        John Donoghue <address@hidden>
|  date:        Sun Nov 17 21:31:49 2013 -0500
|  summary:     Use gnulib uname
|
o  changeset:   17978:265f9186e543
|  user:        PrasannaKumar Muralidharan <address@hidden>
|  date:        Thu Nov 14 22:31:43 2013 +0530
|  summary:     Fix uninitialised parameters in pixel2status
|
o  changeset:   17977:1ed269bdea58
|  user:        Pantxo Diribarne <address@hidden>
|  date:        Sun Nov 17 21:19:52 2013 +0100
|  summary:     octave-gui.cc: use QApplication instead of QCoreApplication in 
--no-gui mode.
|
o  changeset:   17976:efe3e288a20c
|  user:        Torsten <address@hidden>
|  date:        Sun Nov 17 12:47:58 2013 +0100
|  summary:     check the creation of settings object for success before 
starting the gui

If I "hg import" my changeset, I get:

@  changeset:   17980:15f9042d9bee
|  bookmark:    @
|  tag:         tip
|  user:        Carlo de Falco <address@hidden>
|  date:        Mon Nov 18 09:23:15 2013 +0100
|  summary:     Document calling DEFUN functions in C++.
|
o  changeset:   17979:a4bc3ad4c703
|  user:        John Donoghue <address@hidden>
|  date:        Sun Nov 17 21:31:49 2013 -0500
|  summary:     Use gnulib uname
|
o  changeset:   17978:265f9186e543
|  user:        PrasannaKumar Muralidharan <address@hidden>
|  date:        Thu Nov 14 22:31:43 2013 +0530
|  summary:     Fix uninitialised parameters in pixel2status
|
o  changeset:   17977:1ed269bdea58
|  user:        Pantxo Diribarne <address@hidden>
|  date:        Sun Nov 17 21:19:52 2013 +0100
|  summary:     octave-gui.cc: use QApplication instead of QCoreApplication in 
--no-gui mode.
|
o  changeset:   17976:efe3e288a20c
|  user:        Torsten <address@hidden>
|  date:        Sun Nov 17 12:47:58 2013 +0100
|  summary:     check the creation of settings object for success before 
starting the gui

which looks OK, but if I try to push mercurial says:

pushing to ssh://address@hidden/octave
no changes made to subrepo gnulib-hg since last push to 
ssh://address@hidden/octave/gnulib-hg
searching for changes
abort: push creates new remote head 06042712c512!
(merge or see "hg help push" for details about pushing new heads)

"hg rebase" says "nothing to rebase", so how should I proceed?

c.

open_Ym2z9f70.txt
Description: Text document