[petsc-dev] PETSc developers who use weird MPI

[Satish Balay]

No I did not. If you look at gitk - my commits are on to of your

53deab39b05c95f82ded0f9b5ed98e1eca77ec57

But somehow it got cherrypicked over master commit as
a49f225f21e5e022456a96fbd0a3a873045b2c5d and then remerged into
prbrune/sf-sfbasicops'?

$ git branch -r --contains a49f225f21e5e022456a96fbd0a3a873045b2c5d
  origin/prbrune/mat-matcolor
  origin/prbrune/sf-sfbasicops

'git reflog' might have some relavent info

Since this cherrypicked/rebased commit is not needed 
force update prbrune/sf-sfbasicops to the previous state at
f3fe83a48b02c7fae642249467649629cca6fe7e?

[assuming its not yet merged into other branches]

Satish

On Fri, 1 Nov 2013, Peter Brune wrote:

> Did you rebase prbrune/sf-sfbasicops?  I get odd merges.
> 
> - Peter
> 
> 
> On Fri, Nov 1, 2013 at 9:29 PM, Satish Balay <balay at mcs.anl.gov> wrote:
> 
> > On Fri, 1 Nov 2013, Satish Balay wrote:
> >
> > >
> > > Somehow the snapshot of 'prbrune/sf-sfbasicops' [prior to my fix] got
> > merged into 'barry/saws'
> > > [I'll have to check these branches to see the path.]
> > >
> > > The fix is to merge latest 'prbrune/sf-sfbasicops' in the same pathway
> > it got into 'barry/saws'
> >
> > Ok the branches that have the offending commit:
> > >>>>
> > balay at mockingbird /home/balay/petsc (barry/saws)
> > $ git branch -r --contains 53deab3
> >   origin/barry/saws
> >   origin/madams/sr-driver
> >   origin/next
> >   origin/prbrune/fas-gscolorsecant
> >   origin/prbrune/mat-matcolor
> >   origin/prbrune/sf-sfbasicops
> > <<<<<<<
> >
> > Now see which of of the above branches got merged to 'barry/saws'
> >
> > >>>>>>>
> > balay at mockingbird /home/balay/petsc (barry/saws)
> > $ git log --merges --oneline |head
> > d548240 Merge branch 'prbrune/mat-matcolor' into barry/saws
> > fcaff9f Merge branch 'jed/check-pointer-runtime' into barry/saws
> > 7737a22 Merge branch 'master' into barry/saws
> > ad7c120 Merge branch 'knepley/feature-test-parser'
> > b4a5846 Merge branch 'prbrune/snes-qnscaling'
> > f5cedc2 Merge branch 'knepley/feature-plex-refine-3d'
> > 1fa8f14 Merge branch 'knepley/feature-plex-reordering'
> > dc1b40d Merge branch 'maint'
> > 7390fa2 Merge branch 'balay/configure-winpython-check' into maint
> > 39481a4 Merge branch 'balay/add-newline-between-stdout-stderr' into maint
> > balay at mockingbird /home/balay/petsc (barry/saws)
> > $
> > <<<<<<<<
> >
> > Looks like Barry merged 'prbrune/mat-matcolor' into 'barry/saw'
> >
> > >>>>>>>
> > balay at mockingbird /home/balay/petsc (prbrune/mat-matcolor)
> > $ git log --merges --oneline |head
> > 70ec7f0 Merge branch 'prbrune/sf-sfbasicops' into prbrune/mat-matcolor
> > 16407d4 Merge branch 'master' into prbrune/mat-matcolor
> > 76ef003 Merge branch 'jed/datafiles-inherit'
> > 35132eb Merge branch 'jed/dmvecmattypes-stdcoords'
> > 7f96713 Merge branch 'jed/options-insert-bcast-bgq'
> > 13cbb55 Merge branch 'jed/avoid-getpwuid'
> > b15a537 Merge branch 'knepley/fix-windows-download'
> > 2c3e1d3 Merge branch 'balay/__float128-fix-download-f2cblas-mesg'
> > 7a7ac0e Merge branch 'maint'
> > a04acb8 Merge branch 'jed/fix-fieldsplit-mg-example'
> > balay at mockingbird /home/balay/petsc (prbrune/mat-matcolor)
> > $
> > <<<<<<
> >
> > Ok peter merged the 'prbrune/sf-sfbasicops' snapshot prior to my fix
> > into 'prbrune/mat-matcolor'
> >
> > ok prbrune/sf-sfbasicops -> prbrune/mat-matcolor -> barry/saws
> >
> > So the fix is to do the same merges with the latest prbrune/sf-sfbasicops
> >
> > Peter?
> >
> > Satish
> >
>