Satish Balay <[email protected]> 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@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. > I see you [or someone else] did some branch cleanup. Perhaps there are > more branches that can be deleted on the server. I cleaned up old branches some weeks ago. > I see the following branches merged to v3.5 release. perhaps they can > be deleted now? > > Thanks, > Satish > > ------- > $ git branch -r --merged v3.5 |egrep -v origin\/\(master\|maint\|next\) > origin/balay/add-ISColoringValue-to-finclude > origin/balay/chk-optflags-in-cflags > origin/balay/fix-multiple-zisltogf.c > origin/balay/fix-win32-printf-2digit-exponent > origin/balay/remove_intel_fast > origin/barry/feature-OSX-example > origin/barry/feature-dmmoab-hdf5-tests > origin/barry/fix-istogeneral_block > origin/barry/fix-matlab-socket > origin/barry/fix-redundant-matrix > origin/barry/vince > origin/bermeo/add-mkl-pardiso > origin/hzhang/mat-inertia > origin/jed/license > origin/knepley/doc-fe-dualspace > origin/knepley/feature-problem-class > origin/knepley/feature-quad-fas > origin/knepley/fix-complex-build > origin/knepley/fix-fe-gpu > origin/sarich/fix-tao-linesearch-counter-view > origin/sarich/tao-purge-dm > origin/shri/ts-events > origin/stefano_zampini/pcbddc-maint done
pgpGDszzrsMNY.pgp
Description: PGP signature
