[petsc-dev] strangness in Chebyshev estimate of eigenvalues

[Satish Balay]

This is hopeless..

Did you reset your 'mark/snes-ex56c' again to the old stuff?

I don't get any merge conflicts - If I start from Jed's rebased/branch commit f2cb8422898d35ef96e146caa3a95b2f879b25f1

balay at asterix /home/balay/petsc (master=)
$ git co -b test f2cb8422898d35ef96e146caa3a95b2f879b25f1
Switched to a new branch 'test'
balay at asterix /home/balay/petsc (test)
$ git rebase -i master
Successfully rebased and updated refs/heads/test.

<after a editor prompt with the following commits - for interactive rebase>
pick 849c9e8 changed Cheby random to noisy
pick ee4626e added snes ex56, Plex with 3D linear elasticity
pick b79c9a7 added ex56 in snes, 3D linear elasticity using Plex on a cube
pick a64eebe clean up cheby fix
pick 23c3567 small cleanup of noisy cheby
pick cc7a30b fix ex56 init/fin error
pick c34fc5a remove spaces
pick 0008a30 fix complex build
pick e78b637 updated test for new cheby
pick 4acf97d fixed test for new cheby
pick fdcaa90 merge makefile changed for ex56 and parmetis
pick f2cb842 fixed bug in makefile

Satish


On Wed, 25 May 2016, Mark Adams wrote:

> I do git rebase -i master, and I get a lot of these:
> 
> 10:53 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git
> rebase -i master
> error: could not apply 121daff... I am sick of finding examples that have
> no test cases!
> 
> When you have resolved this problem, run "git rebase --continue".
> If you prefer to skip this patch, run "git rebase --skip" instead.
> To check out the original branch and stop rebasing, run "git rebase
> --abort".
> Could not apply 121daff3befe8860e39d0d85f21fecb925e5e5cd... I am sick of
> finding examples that have no test cases!
> 
> I did this this morning and there were about 8 of these conflicts that I
> had to fix manually. I wanted to check before I proceed. They were
> straightforward fixes.
> 
> Mark
> 
> 
> On Wed, May 25, 2016 at 10:40 AM, Mark Adams <mfadams at lbl.gov> wrote:
> 
> >
> >
> > On Wed, May 25, 2016 at 10:18 AM, Satish Balay <balay at mcs.anl.gov> wrote:
> >
> >> On Wed, 25 May 2016, Mark Adams wrote:
> >>
> >> >
> >> > 10:09 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git
> >> reset
> >> > --hard f2cb8422898d35ef96e146caa3a95b2f879b25f1
> >> > HEAD is now at f2cb842 fixed bug in makefile
> >> >
> >> > OK, now what?
> >>
> >> 1. Verify that its feature complete as you expect [and not missing any
> >> commits]?
> >>
> >> gitk master..mark/snes-ex56c
> >>
> >
> > I got this error:
> >
> > 10:37 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ gitk
> > master..mark/snes-ex56c
> > Error in startup script: unknown color name "lime"
> >     (processing "-fore" option)
> >     invoked from within
> > "$ctext tag conf m2 -fore [lindex $mergecolors 2]"
> >     (procedure "makewindow" line 347)
> >     invoked from within
> > "makewindow"
> >     (file "/Users/markadams/homebrew/bin/gitk" line 12434)
> >
> >
> >
> >>
> >> 2. Update branch as needed [perhaps you were wanting to squash
> >> commits? since you've mentioned 'rebase -i' previously?]
> >>
> >>
> > git rebase -i
> >
> > or
> >
> > git rebase -i master
> >
> > ?
> >
> >
> >> 3. verify and test locally?
> >>
> >> 4. update 'mark/snes-ex56c' on server.
> >>
> >> git push -f
> >>
> >> 5. If feature complete - update pull request?
> >>
> >> Satish
> >>
> >
> >
>