[petsc-dev] unwind next branch

[Matthew Knepley]

On Tue, Sep 9, 2014 at 6:33 PM, Satish Balay <balay at mcs.anl.gov> wrote:

> On Tue, 9 Sep 2014, Jed Brown wrote:
>
> > Satish Balay <balay at mcs.anl.gov> writes:
> >
> > > Jed,
> > >
> > > After 3.5 release we have not unwound next branch.
> > >
> > > With 3.5.2 out - is it a good time to unwind?
> > >
> > > This might need some coordination as there are some old branches that
> > > are not yet merged to master/next.. (so they need rebase?)
> >
> > I'd rather re-merge than rebase unless there was something wrong with
> the original version.
> >
> > > balay at asterix /home/balay/petsc (master)
> > > $ comm -12 <(git branch -r --merged next | sort) <(git branch -r
> --no-merged master | sort)
> > >   origin/balay/fix-glibc-2.20_DEFAULT_SOURCE
> > >   origin/balay/update-etags
> > >   origin/balay/update-hdf5
> > >   origin/jed/sr-driver4
> > >   origin/jed/vecghostgetvalues
> > >   origin/karpeev/fix-ksp-pcgasm
> > >   origin/knepley/feature-optcontrol-mg
> > >   origin/knepley/feature-plex-nasm
> > >   origin/knepley/feature-quadrature-fortran
> > >   origin/knepley/fix-quadrature-order
> > >   origin/madams/sr-driver4
> > >   origin/mlange05/fix-gmsh-coordinates
> > >   origin/next
> > >   origin/paulmullowney/aijcusp-ellpack-fix
> > >   origin/prbrune/sf-examplefix
> > >   origin/prbrune/snes-ex19vtkoutput
> > >   origin/sarich/fix-tao-linesearch-reset
> > >   origin/sarich/fix-tao-pounders-repeating
> > >   origin/sarich/tao-add-fortran-stubs
> > >   origin/sarich/tao-get-number-ksp-its
> > >   origin/sarich/tao-history-store-ksp-its
> > >   origin/shri/ts-dae-semi-explicit
> > >   origin/shri/ts-is-for-differential-variables
> > >   origin/shri/ts-powergrid
> > >   origin/stefano_zampini/pcbddc-changeofbasis
> > >   origin/stefano_zampini/pcbddc_deluxe
> > >   origin/stefano_zampini/pcbddc-primalfixes
> > >   origin/tisaac/dm-dim-embed-auto
> > >   origin/tisaac/thplex
> > >   origin/tisaac/thplex-remove-ksp-loop
> > >
> > > [how about branches that got merged from bitbucket web interface?]
> >
> > I hope that didn't happen much.  Let's give people some time to comment
> > on these branches.  Let's try to graduate those that can in the near
> > future, then reset 'next' and re-merge the left-over branches.
>
> Ok.
>
> Also we have quiet a few development branches. Not sure if any
> of them are abandoned [and should be purged..]. Perhaps we
> should review these branches aswell.
>
> Satish
>
> ---------
>
> $ git branch -r --no-merged origin/next  |cat
>   origin/HEAD -> origin/master
>   origin/adams/zeroDSOR
>   origin/balay/atpesc-tutorial-2014-bgq
>   origin/balay/giturl-fixes
>   origin/barry/add-snespseudo
>   origin/barry/august-tutorial
>   origin/barry/fix-prefix-installs
>   origin/barry/html
>   origin/barry/make-petscoptionsobject-nonglobal
>   origin/barry/new-test-makefiles
>   origin/barry/newhtml
>   origin/barry/saws-options
>   origin/barry/superlu_mt
>   origin/barry/twitter
>   origin/dalcinl/dm-destroy
>   origin/debo/mat-taij
>   origin/debo/ts-irk
>   origin/emil/fix-ts-dae
>   origin/hzhang/fix-ptaptest
>   origin/hzhang/ksp-fminres
>   origin/hzhang/ksp-minresqlp
>   origin/irving/fe-scalars
>   origin/irving/snes-ex12-cleanup
>   origin/jed/assembly-perf
>   origin/jed/august-tutorial
>   origin/jed/chem
>   origin/jed/cray-externc
>   origin/jed/defined-nocpp
>   origin/jed/feature-dmda-section
>   origin/jed/feature-sf-local
>   origin/jed/ksp-plugin
>   origin/jed/mat-eigenvalue-cache
>   origin/jed/mat-taij
>   origin/jed/next-seaice
>   origin/jed/sr-driver
>   origin/jed/tap
>   origin/jed/ts-ex11-union
>   origin/jed/ts-heat-plex
>   origin/jose/mumps-bugfix
>   origin/karpeev/fix-pc-fieldsplit-reset
>   origin/klaij/fieldsplit-simple-ex70
>


>    Delete     origin/knepley/dmswarm
>    Keep       origin/knepley/feature-da-repartition
>    Merged   origin/knepley/feature-ds-fortran-example
>    Keep       origin/knepley/feature-fe-fv-hybrid
>    Merged  origin/knepley/fix-mem-init
>    Keep      origin/knepley/pylith
>    Keep      origin/knepley/solkx
>    Delete    origin/knepley/sr-driver
>    Keep      origin/knepley/swarm
>

   Matt

  origin/madams/ex56params
>   origin/madams/sor-residual
>   origin/madams/sr-driver
>   origin/madams/sr-driver2
>   origin/madams/sr1
>   origin/maint
>   origin/maint-tao-2.2
>   origin/mark/dmshell-ltogmap
>   origin/mark/dmshell-test
>   origin/mark/fortanenums
>   origin/mark/gamg-zerod
>   origin/master
>   origin/mlange/fix-adjacency-performance
>   origin/mlange/plex-distributed-overlap
>   origin/mlange/plex-redistribute
>   origin/mlange/plex-vertex-partitioning
>   origin/peller/threadcomm
>   origin/prbrune/matcoloring-creategraph
>   origin/prbrune/matcoloring-minpack
>   origin/prbrune/matcoloring-misimprovement
>   origin/prbrune/matcoloring-zoltan
>   origin/prbrune/pcgamg-bootstrap
>   origin/prbrune/pcgamg-classicalbootstrap
>   origin/prbrune/pcgamg-cr
>   origin/prbrune/snes-fasadditive
>   origin/prbrune/zoltanupdate
>   origin/psanan/ts-bz-examples
>   origin/psanan/ts-multiscale
>   origin/psanan/ts-rhs-partitions
>   origin/psanan/ts-tests
>   origin/psanan/vec-mtdot-fix
>   origin/sarich/fix-tao-example-warning
>   origin/sarich/rnet-all
>   origin/sarich/rnet-fix-rebase
>   origin/sarich/rnet-import
>   origin/sarich/snesvi-subvec-options
>   origin/sarich/tao-docs-update
>   origin/sarich/tao-lnks
>   origin/sarich/tao-separate-state-design
>   origin/shri/FTRTDS-project
>   origin/shri/external-package-KLU
>   origin/shri/feature-dm-circuit
>   origin/stefano_zampini/dmda-changeaotype
>   origin/stefano_zampini/dmdagetao-memscalable
>   origin/stefano_zampini/hypre-ams
>   origin/tisaac/fix-gamg-set-coordinates
>   origin/tisaac/petsc-next-upstream
>   origin/tisaac/thplex-on-master
>   origin/tisaac/warn-next-upstream
>   origin/xolotl
> balay at asterix /home/balay/petsc (master)
> $
>



-- 
What most experimenters take for granted before they begin their
experiments is infinitely more interesting than any results to which their
experiments lead.
-- Norbert Wiener
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140910/cc5b0a83/attachment.html>