<div dir="ltr">Please keep all my branches not yet merged to master<br></div><div class="gmail_extra"><br><div class="gmail_quote">2014-09-10 2:33 GMT+03:00 Satish Balay <span dir="ltr"><<a href="mailto:balay@mcs.anl.gov" target="_blank">balay@mcs.anl.gov</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Tue, 9 Sep 2014, Jed Brown wrote:<br>
<br>
> Satish Balay <<a href="mailto:balay@mcs.anl.gov">balay@mcs.anl.gov</a>> writes:<br>
><br>
> > Jed,<br>
> ><br>
> > After 3.5 release we have not unwound next branch.<br>
> ><br>
> > With 3.5.2 out - is it a good time to unwind?<br>
> ><br>
> > This might need some coordination as there are some old branches that<br>
> > are not yet merged to master/next.. (so they need rebase?)<br>
><br>
> I'd rather re-merge than rebase unless there was something wrong with the original version.<br>
><br>
> > balay@asterix /home/balay/petsc (master)<br>
> > $ comm -12 <(git branch -r --merged next | sort) <(git branch -r --no-merged master | sort)<br>
> > origin/balay/fix-glibc-2.20_DEFAULT_SOURCE<br>
> > origin/balay/update-etags<br>
> > origin/balay/update-hdf5<br>
> > origin/jed/sr-driver4<br>
> > origin/jed/vecghostgetvalues<br>
> > origin/karpeev/fix-ksp-pcgasm<br>
> > origin/knepley/feature-optcontrol-mg<br>
> > origin/knepley/feature-plex-nasm<br>
> > origin/knepley/feature-quadrature-fortran<br>
> > origin/knepley/fix-quadrature-order<br>
> > origin/madams/sr-driver4<br>
> > origin/mlange05/fix-gmsh-coordinates<br>
> > origin/next<br>
> > origin/paulmullowney/aijcusp-ellpack-fix<br>
> > origin/prbrune/sf-examplefix<br>
> > origin/prbrune/snes-ex19vtkoutput<br>
> > origin/sarich/fix-tao-linesearch-reset<br>
> > origin/sarich/fix-tao-pounders-repeating<br>
> > origin/sarich/tao-add-fortran-stubs<br>
> > origin/sarich/tao-get-number-ksp-its<br>
> > origin/sarich/tao-history-store-ksp-its<br>
> > origin/shri/ts-dae-semi-explicit<br>
> > origin/shri/ts-is-for-differential-variables<br>
> > origin/shri/ts-powergrid<br>
> > origin/stefano_zampini/pcbddc-changeofbasis<br>
> > origin/stefano_zampini/pcbddc_deluxe<br>
> > origin/stefano_zampini/pcbddc-primalfixes<br>
> > origin/tisaac/dm-dim-embed-auto<br>
> > origin/tisaac/thplex<br>
> > origin/tisaac/thplex-remove-ksp-loop<br>
> ><br>
> > [how about branches that got merged from bitbucket web interface?]<br>
><br>
> I hope that didn't happen much. Let's give people some time to comment<br>
> on these branches. Let's try to graduate those that can in the near<br>
> future, then reset 'next' and re-merge the left-over branches.<br>
<br>
</div></div>Ok.<br>
<br>
Also we have quiet a few development branches. Not sure if any<br>
of them are abandoned [and should be purged..]. Perhaps we<br>
should review these branches aswell.<br>
<br>
Satish<br>
<br>
---------<br>
<br>
$ git branch -r --no-merged origin/next |cat<br>
origin/HEAD -> origin/master<br>
origin/adams/zeroDSOR<br>
origin/balay/atpesc-tutorial-2014-bgq<br>
origin/balay/giturl-fixes<br>
origin/barry/add-snespseudo<br>
origin/barry/august-tutorial<br>
origin/barry/fix-prefix-installs<br>
origin/barry/html<br>
origin/barry/make-petscoptionsobject-nonglobal<br>
origin/barry/new-test-makefiles<br>
origin/barry/newhtml<br>
origin/barry/saws-options<br>
origin/barry/superlu_mt<br>
origin/barry/twitter<br>
origin/dalcinl/dm-destroy<br>
origin/debo/mat-taij<br>
origin/debo/ts-irk<br>
origin/emil/fix-ts-dae<br>
origin/hzhang/fix-ptaptest<br>
origin/hzhang/ksp-fminres<br>
origin/hzhang/ksp-minresqlp<br>
origin/irving/fe-scalars<br>
origin/irving/snes-ex12-cleanup<br>
origin/jed/assembly-perf<br>
origin/jed/august-tutorial<br>
origin/jed/chem<br>
origin/jed/cray-externc<br>
origin/jed/defined-nocpp<br>
origin/jed/feature-dmda-section<br>
origin/jed/feature-sf-local<br>
origin/jed/ksp-plugin<br>
origin/jed/mat-eigenvalue-cache<br>
origin/jed/mat-taij<br>
origin/jed/next-seaice<br>
origin/jed/sr-driver<br>
origin/jed/tap<br>
origin/jed/ts-ex11-union<br>
origin/jed/ts-heat-plex<br>
origin/jose/mumps-bugfix<br>
origin/karpeev/fix-pc-fieldsplit-reset<br>
origin/klaij/fieldsplit-simple-ex70<br>
origin/knepley/dmswarm<br>
origin/knepley/feature-da-repartition<br>
origin/knepley/feature-ds-fortran-example<br>
origin/knepley/feature-fe-fv-hybrid<br>
origin/knepley/fix-mem-init<br>
origin/knepley/pylith<br>
origin/knepley/solkx<br>
origin/knepley/sr-driver<br>
origin/knepley/swarm<br>
origin/madams/ex56params<br>
origin/madams/sor-residual<br>
origin/madams/sr-driver<br>
origin/madams/sr-driver2<br>
origin/madams/sr1<br>
origin/maint<br>
origin/maint-tao-2.2<br>
origin/mark/dmshell-ltogmap<br>
origin/mark/dmshell-test<br>
origin/mark/fortanenums<br>
origin/mark/gamg-zerod<br>
origin/master<br>
origin/mlange/fix-adjacency-performance<br>
origin/mlange/plex-distributed-overlap<br>
origin/mlange/plex-redistribute<br>
origin/mlange/plex-vertex-partitioning<br>
origin/peller/threadcomm<br>
origin/prbrune/matcoloring-creategraph<br>
origin/prbrune/matcoloring-minpack<br>
origin/prbrune/matcoloring-misimprovement<br>
origin/prbrune/matcoloring-zoltan<br>
origin/prbrune/pcgamg-bootstrap<br>
origin/prbrune/pcgamg-classicalbootstrap<br>
origin/prbrune/pcgamg-cr<br>
origin/prbrune/snes-fasadditive<br>
origin/prbrune/zoltanupdate<br>
origin/psanan/ts-bz-examples<br>
origin/psanan/ts-multiscale<br>
origin/psanan/ts-rhs-partitions<br>
origin/psanan/ts-tests<br>
origin/psanan/vec-mtdot-fix<br>
origin/sarich/fix-tao-example-warning<br>
origin/sarich/rnet-all<br>
origin/sarich/rnet-fix-rebase<br>
origin/sarich/rnet-import<br>
origin/sarich/snesvi-subvec-options<br>
origin/sarich/tao-docs-update<br>
origin/sarich/tao-lnks<br>
origin/sarich/tao-separate-state-design<br>
origin/shri/FTRTDS-project<br>
origin/shri/external-package-KLU<br>
origin/shri/feature-dm-circuit<br>
origin/stefano_zampini/dmda-changeaotype<br>
origin/stefano_zampini/dmdagetao-memscalable<br>
origin/stefano_zampini/hypre-ams<br>
origin/tisaac/fix-gamg-set-coordinates<br>
origin/tisaac/petsc-next-upstream<br>
origin/tisaac/thplex-on-master<br>
origin/tisaac/warn-next-upstream<br>
origin/xolotl<br>
balay@asterix /home/balay/petsc (master)<br>
$<br>
</blockquote></div><br><br clear="all"><br>-- <br>Stefano
</div>