Re: hg problem

[John W. Eaton]

On 08/01/2016 03:13 AM, Ernst Reissner wrote:
> On 07/30/2016 12:16 AM, John W. Eaton wrote:

> > 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?

Please copy your replies to the mailing list.

> my log looks as shown below.
>
> Hope that helps you understanding what I did.
>
> I also must ask how to deal with patches in future.
>
> I exported just, then update and merge...
>
> Is this the root of all evil??

Instead of doing that, we are asking that you rebase your changes.  You 
can usually do that by using

  hg pull --rebase

instead of pull+merge.

But in any case, you can still submit patches.  Just export the 
changesets that you actually made (not the merges).  For your repo, that 
means:

  hg export dd31a8804f49

as that seems to be the only change you've made that's not a merge.

Maybe others will have better advice.

jwe


> Ernst
>
>
> 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:   22198:8971508e21c8
> bookmark:    @
> 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:   22197:e68128601f5e
> parent:      22195:829e0aafebdc
> user:        John W. Eaton <address@hidden>
> date:        Thu Jul 28 16:07:11 2016 -0400
> summary:     skip invalid objects in Qt graphics event handlers (bug #46501)
>
> 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:   22195:829e0aafebdc
> parent:      22193:1344509a480c
> user:        Andreas Weber <address@hidden>
> date:        Thu Jul 28 16:54:54 2016 +0200
> summary:     dump_demos.m: Change regex for replacement of double
> quotes, add dummy assert
>
> changeset:   22194:fee0dca31524
> parent:      22192:f591c2c96f28
> parent:      22193:1344509a480c
> user:        Ernst Reissnere <address@hidden>
> date:        Thu Jul 28 11:31:28 2016 +0200
> summary:     merge
>
>
> changeset:   22193:1344509a480c
> parent:      22190:2aae8894885b
> user:        John W. Eaton <address@hidden>
> date:        Wed Jul 27 18:25:31 2016 -0400
> summary:     style fixes
>
> changeset:   22192:f591c2c96f28
> parent:      22191:9fa97250cdf6
> parent:      22190:2aae8894885b
> user:        Ernst Reissnere <address@hidden>
> date:        Thu Jul 28 00:02:21 2016 +0200
> summary:     merge
>
> changeset:   22191:9fa97250cdf6
> parent:      22185:dd31a8804f49
> parent:      22188:dc20b737ee79
> user:        Ernst Reissnere <address@hidden>
> date:        Thu Jul 28 00:01:50 2016 +0200
> summary:     merge
>
> changeset:   22190:2aae8894885b
> user:        Carnë Draug <address@hidden>
> date:        Wed Jul 27 14:52:09 2016 +0100
> summary:     xzip.cc: replace throwing exceptions in destructors (bug
> #48640)
>
> changeset:   22189:9aff1ce307b1
> user:        John W. Eaton <address@hidden>
> date:        Wed Jul 27 16:25:45 2016 -0400
> summary:     do system dependent and default variable inits early (bug #)
>
>
>
>
> changeset:   22188:dc20b737ee79
> user:        John W. Eaton <address@hidden>
> date:        Tue Jul 26 10:40:46 2016 -0400
> summary:     * interpreter.cc (interpreter::interpreter): Fix typo in
> previous change.
>
> changeset:   22187:a032ffb80704
> user:        John W. Eaton <address@hidden>
> date:        Tue Jul 26 09:49:56 2016 -0400
> summary:     don't print startup message for --eval (bug #48620)
>
> changeset:   22186:bfb1b089c230
> parent:      22183:eb8667f2faac
> user:        Marco Caliari <address@hidden>
> date:        Mon Jul 25 14:50:29 2016 +0100
> summary:     New function normest1 as replacement for onenormest (patch
> #8837)
>
> changeset:   22185:dd31a8804f49
> user:        Ernst Reissnere <address@hidden>
> date:        Wed Jul 27 10:57:24 2016 +0200
> summary:     renamed autoJava2octNumber-->is_auto_convertible_number
>
> changeset:   22184:c925352b5225
> parent:      22176:c5b6e4c271ed
> parent:      22183:eb8667f2faac
> user:        Ernst Reissnere <address@hidden>
> date:        Tue Jul 26 12:31:17 2016 +0200
> summary:     merge
>
> changeset:   22183:eb8667f2faac
> user:        Lachlan Andrew <address@hidden>
> date:        Thu Jun 30 18:20:37 2016 +1000
> summary:     Fix assignment to an property of an element of classdef
> array (bug #46660)