[petsc-dev] strangness in Chebyshev estimate of eigenvalues

[Satish Balay]

Yeah - Sorry - bad copy/paste gave the wrong commit-id.

Here this the process you would normally follow [without gitk]

>From the 'git log master..branch' list below - you have to find the
starting commit - from where you want to rebase -i'.

So you would perhaps want the following to be the starting commit.

>>>>>>>
> commit af1c4d2ad570dd93a87158e0a6b031ad52f71ccd
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Thu May 19 13:14:27 2016 -0400
>
>     changed Cheby random to noisy
<<<<<<<

Now you have to find the parent of this starting commit. [as git
rebase -i expects the prior commit to the first commit you want to
interactively rebase/ modify]

>>>>>>>..
$ git show -q af1c4d2ad570dd93a87158e0a6b031ad52f71ccd^
commit f303cd651cc9f18b5b8505d3b571425f3b3e5c1a
Merge: ca41317 391bf75
Author: Satish Balay <balay at mcs.anl.gov>
Date:   Wed May 25 09:29:21 2016 -0500

    Merge branch 'maint'
<<<<<<<<<<

Ok - so I have to do 'git rebase -i f303cd651cc9f18b5b8505d3b571425f3b3e5c1a'

Now I see the following in my editor:

pick af1c4d2 changed Cheby random to noisy
pick e70b400 added snes ex56, Plex with 3D linear elasticity
pick 2338f0f added ex56 in snes, 3D linear elasticity using Plex on a cube
pick d90d04b clean up cheby fix
pick 217c9eb small cleanup of noisy cheby
pick 48be401 fix ex56 init/fin error
pick fa39300 remove spaces
pick 422f8fa fix complex build
pick c845188 updated test for new cheby
pick 5de3a4c fixed test for new cheby
pick 360b861 merge makefile changed for ex56 and parmetis
pick 7216b81 fixed bug in makefile


Satish


On Wed, 25 May 2016, Mark Adams wrote:

> Satish, this seems to have these intermediate commits that I want to
> squash.  But
> 
> git rebase -i 7216b81e99debbb3a0e1c5dd0b26b0d24a8a5ac0
> 
> does not show them to me?
> 
> 12:01 mark/snes-ex56c= ~/Codes/petsc$ git log master..mark/snes-ex56c
> commit 7216b81e99debbb3a0e1c5dd0b26b0d24a8a5ac0
> Author: Mark Adams <mfadams at lbl.gov>
> Date:   Mon May 23 16:54:49 2016 -0700
> 
>     fixed bug in makefile
> 
> commit 360b86139440ffcba9e7fa415a181a97e81d85f4
> Author: Barry Smith <bsmith at mcs.anl.gov>
> Date:   Mon May 23 15:24:40 2016 -0500
> 
>     merge makefile changed for ex56 and parmetis
> 
> commit 5de3a4cbdf1af535fdc82d14bd6ac1ae9d542b9e
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Sun May 22 16:48:56 2016 -0400
> 
>     fixed test for new cheby
> 
> commit c8451888fd20ba830f186674f6df6761f650015e
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Fri May 20 13:05:06 2016 -0400
> 
>     updated test for new cheby
> 
> commit 422f8fa3013d4b963ccddbce83fab70126ff79f0
> Author: Satish Balay <balay at mcs.anl.gov>
> Date:   Thu May 19 23:58:47 2016 -0500
> 
>     fix complex build
> 
> commit fa3930088f20f35c4f8818784acadd8fcbe6fcc5
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Thu May 19 20:20:43 2016 -0400
> 
>     remove spaces
> 
> commit 48be401005a1195f078b5a07cda69d59e6c0df60
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Thu May 19 20:09:41 2016 -0400
> 
>     fix ex56 init/fin error
> 
> commit 217c9eba035b6c6bb1298744fd50553f30c34f16
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Thu May 19 18:55:14 2016 -0400
> 
>     small cleanup of noisy cheby
> 
> commit d90d04b535a6685c2baf9d88f145e9379f58d0cc
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Thu May 19 15:21:28 2016 -0400
> 
>     clean up cheby fix
> 
> commit 2338f0fd7a9afb60de759da714843ed7f6e2980e
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Thu May 19 15:07:53 2016 -0400
> 
>     added ex56 in snes, 3D linear elasticity using Plex on a cube
> 
> commit e70b400076a29e1c15cd73c1b1a3962fe9f57428
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Thu May 19 13:37:10 2016 -0400
> 
>     added snes ex56, Plex with 3D linear elasticity
> 
> commit af1c4d2ad570dd93a87158e0a6b031ad52f71ccd
> Author: Mark Adams <cal2princeton at yahoo.com>
> Date:   Thu May 19 13:14:27 2016 -0400
> 
>     changed Cheby random to noisy
> 12:01 mark/snes-ex56c= ~/Codes/petsc$
>