Re: hg problem

[John W. Eaton]

On 07/29/2016 05:58 PM, Ernst Reissner wrote:
> Please help: I have non-empty export although pull and update do not
> show changes.
> I would like to solve the hg problem before committing further patches.
>
> Thank you for help,
>
> Ernst
> > now I have
> >
> > address@hidden:~/Octave/octave> hg heads
> > changeset:   22199:14a4a5f62595
> > tag:         tip
> > parent:      22196:d821e306c922
> > parent:      22198:8971508e21c8
> > user:        Ernst Reissner <address@hidden>
> > date:        Fri Jul 29 00:55:00 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).
> >
> > so all ok.
> >
> > 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> hg update
> > 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >
> > address@hidden:~/Octave/octave> hg diff
> > is empty
> >
> > and so all ok. BUT:
> >
> >
> > address@hidden:~/Octave/octave> hg export
> > # HG changeset patch
> > # User Ernst Reissner <address@hidden>
> > # Date 1469746500 -7200
> > #      Fri Jul 29 00:55:00 2016 +0200
> > # Node ID 14a4a5f625950eb0854c665b770e7180ea40286d
> > # Parent  d821e306c9224f7b13eb02423d2ae48383f5961b
> > # Parent  8971508e21c8c5c0d4f138edc06b09e4d0c241e6
> > merge
> >
> > ....
> > +%!   str1 = strjoin (deblank (strsplit (str1, "\n")), "\n");
> > +%!   str2 = strjoin (deblank (strsplit (str2, "\n")), "\n");
> > +%!   assert (hash ("md5", str1), hash ("md5", str2));
> > +%! unwind_protect_cleanup
> > +%!   set (0, "defaultfigurevisible", visibility);
> > +%! end_unwind_protect
> > address@hidden:~/Octave/octave>
> >
> >
> > This is not what I expected.
> >
> > I cannot deliver patches unless this output is empty, right?

Is the changeset with the name "merge" a result of doing an "hg merge"?

I suspect you need to strip the merge changeset and rebase instead, but 
I don't know for sure.

Can you show the output of hg glog up to the point of the first change 
you've made that you have not sent to us yet?

jwe