Re: [petsc-dev] git repo branches housekeeping
Additionally, if you want this done automatically every time you git pull or git fetch, you can set the following in your .gitconfig: [fetch] prune = true Best, Jacob > On Sep 30, 2019, at 10:39 AM, Balay, Satish via petsc-dev > wrote: > > ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2017-September/021359.html > > I've deleted all deveopment branches that are already merged into > maint (v3.12) from https://gitlab.com/petsc/petsc > > However if you wish to remove these branches from your clone - it has > to be done manually (in each clone). > > To get this list of branches to delete - you can do: > > git branch --merged v3.12 |egrep -v " (maint|master|next)" > > branches_to_delete > > After *verifying* the list is correct - and ok to delete - they can be > deleted with: > > git branch -d `cat branches_to_delete` > > And to sync the [deleted] remote branch list info - you can do: > > git fetch -p > > For more housekeeping - look at the remaining local and remote > branches and figure-out what to do. [perhaps some of them are > intermediate branches during rebase - or abandoned features that > should be deleted. And with the new workflow - we could have branches > squashed during merge - that would be equivalent to rebased branches - > that should be deleted]. For my branches - I would do: > > git branch > git branch -r |grep balay > > Satish > > > reference for self: > > $ git branch -r --merged v3.12 |egrep -v origin/\(maint\|master\|next\) |sed > -e s%origin/%:% > remote_branches_to_delete > $ git push -u origin `cat remote_branches_to_delete` | tee delete_branches.log > To gitlab.com:petsc/petsc.git > - [deleted] 360-ci-error-tracker > - [deleted] > BarryFSmith/add-information-on-running-usrbinbash-lo-1561921668145 > - [deleted] Fande-Kong/feature-maij-hmg > - [deleted] Fande-Kong/fix_clean_hash_table > - [deleted] > Junchao-Zhang/part2tex-edited-online-with-bitbucket-1563223298438 > - [deleted] > Patrick-Sanan/shellpcc-edited-online-with-bitbucket-1564998221921 > - [deleted] > Patrick-Sanan/stagutilsc-edited-online-with-bitbucket-1560787739826 > - [deleted] > Stefano-Zampini/taosolver_hjc-edited-online-with-bitbuck-1562852734303 > - [deleted] balay/add-MatBlockMatSetPreallocation-API/maint > - [deleted] balay/add-cxx-dialect-flgs-to-petscconf_h > - [deleted] balay/add-mpi-exec-check/maint > - [deleted] balay/build-update-datafiles > - [deleted] balay/check-tmp-noexec > - [deleted] balay/exodusii-missing-netcdf-pnetcdf-dir > - [deleted] balay/fix-configure-non-english-text-handling/maint > - [deleted] balay/fix-errorcheck-with-batch-hdf5-dir > - [deleted] balay/fix-ex-for-64idx > - [deleted] balay/fix-force > - [deleted] balay/fix-msys2-link > - [deleted] balay/fix-msys2-link-2 > - [deleted] balay/mumps-5.2.1 > - [deleted] balay/test > - [deleted] balay/update-petsc4py-DIVERGED_TR_DELTA > - [deleted] balay/update-petsc4py-jul-2019 > - [deleted] balay/update-petsc4py-rm-PETSC_USE_SCALAR_type-2 > - [deleted] balay/update-solaris-mpich > - [deleted] barry/10-7-2019/fix-prefix-null-error-message > - [deleted] barry/10-7-2019/petscint-size-t > - [deleted] barry/13-7-2019/docs-update-installation-doe-windows > - [deleted] barry/13-7-2019/fix-gmaketest-depend > - [deleted] barry/13-7-2019/fix-mkl-version > - [deleted] barry/13-7-2019/warn-old-gnumake > - [deleted] > barry/2-7-2019/add-info-on-doe-machines-to-installation > - [deleted] barry/2-7-2019/fix-colpack-install > - [deleted] barry/2019-07-13/small-windows-features > - [deleted] barry/2019-07-14/fix-stag-example > - [deleted] barry/2019-07-18/fix-use-socket > - [deleted] barry/2019-07-19/PetscKernel-macros-to-functions > - [deleted] > barry/2019-07-21/fix-petscmallocvalidate-checkmumpshermetian > - [deleted] barry/2019-07-21/parallel-fblaslapack-f2blaslapack > - [deleted] barry/2019-07-21/scalapack-mumps-parallel-make > - [deleted] barry/2019-07-22/fix-sdotnrm-blas-test > - [deleted] barry/2019-07-25/dalcinl/feature-math > - [deleted] barry/2019-07-26/addmissing-pcgamgclassicalfortran > - [deleted] barry/2019-07-30/add-use-petscintcast-corrected > - [deleted] barry/2019-07-30/snesncg-updates > - [deleted] barry/2019-08-01/fix-matmpisbaijsetpreallocationc
Re: [petsc-dev] git repo branches housekeeping
On Mon, 1 Apr 2019, Hapla Vaclav wrote: > > - try to close as many branches as possible on the server [with each PR]. > > Do you mean to tick the checkbox > Close after the pull request is merged > when creating a PR? Or the person merging the PR would use the web interface to do this merge - and 'tick the checkbox' at that merge step. And I would scan branches weekly or [whenever I remember] to spot merged branches that were not deleted. Note: When a PR is from a fork - we manually create a local branch to track its progress through next. Such branches would have to be manually deleted. Satish
Re: [petsc-dev] git repo branches housekeeping
> On 1 Apr 2019, at 20:54, Balay, Satish via petsc-dev > wrote: > > On Mon, 1 Apr 2019, Jed Brown wrote: > >> "Balay, Satish" writes: >> >>> On Mon, 1 Apr 2019, Jed Brown via petsc-dev wrote: >>> "Smith, Barry F. via petsc-dev" writes: > This is, IMHO, a weakness of git. It is crazy to impose this type of > housekeeping directly on all 1000 users of a repository. Perhaps this should be the default: git config --global fetch.prune true >>> >>> or use 'git fetch -p' [ mentioned in my instructions]. I prefer >>> 'fetch' to 'pull' anyway [as it keeps my git prompt sane] - so this >>> works out well for me. >>> But, it would make it harder to recover if someone accidentally deletes a branch on the server. https://stackoverflow.com/a/40842589/33208 >>> >>> This updates the origin/* references to remote branches - but does not >>> delete locally checked out branches [if any] - they have to be >>> manually deleted [as mentioned in my instructions] >> >> Yes, but those are branches that a person has directly interacted with. >> The many other branches would be quietly pruned. > > Agree.. > > We could do: > > - try to close as many branches as possible on the server [with each PR]. Do you mean to tick the checkbox Close after the pull request is merged when creating a PR? Thanks, Vaclav > - recommend folks use 'git config --global fetch.prune true' or 'git fetch > -p' in their regular workflow. > - folks could do housekeeping on their clones (aka delete local branches) at > their own convenient schedule. > - and I'll continue to send the 'housekeeping' e-mail reminder after release. > > Satish
Re: [petsc-dev] git repo branches housekeeping
On Mon, 1 Apr 2019, Jed Brown wrote: > "Balay, Satish" writes: > > > On Mon, 1 Apr 2019, Jed Brown via petsc-dev wrote: > > > >> "Smith, Barry F. via petsc-dev" writes: > >> > >> >This is, IMHO, a weakness of git. It is crazy to impose this type of > >> > housekeeping directly on all 1000 users of a repository. > >> > >> Perhaps this should be the default: > >> > >> git config --global fetch.prune true > > > > or use 'git fetch -p' [ mentioned in my instructions]. I prefer > > 'fetch' to 'pull' anyway [as it keeps my git prompt sane] - so this > > works out well for me. > > > >> > >> But, it would make it harder to recover if someone accidentally deletes > >> a branch on the server. > >> > >> https://stackoverflow.com/a/40842589/33208 > > > > This updates the origin/* references to remote branches - but does not > > delete locally checked out branches [if any] - they have to be > > manually deleted [as mentioned in my instructions] > > Yes, but those are branches that a person has directly interacted with. > The many other branches would be quietly pruned. Agree.. We could do: - try to close as many branches as possible on the server [with each PR]. - recommend folks use 'git config --global fetch.prune true' or 'git fetch -p' in their regular workflow. - folks could do housekeeping on their clones (aka delete local branches) at their own convenient schedule. - and I'll continue to send the 'housekeeping' e-mail reminder after release. Satish
Re: [petsc-dev] git repo branches housekeeping
"Balay, Satish" writes: > On Mon, 1 Apr 2019, Jed Brown via petsc-dev wrote: > >> "Smith, Barry F. via petsc-dev" writes: >> >> >This is, IMHO, a weakness of git. It is crazy to impose this type of >> > housekeeping directly on all 1000 users of a repository. >> >> Perhaps this should be the default: >> >> git config --global fetch.prune true > > or use 'git fetch -p' [ mentioned in my instructions]. I prefer > 'fetch' to 'pull' anyway [as it keeps my git prompt sane] - so this > works out well for me. > >> >> But, it would make it harder to recover if someone accidentally deletes >> a branch on the server. >> >> https://stackoverflow.com/a/40842589/33208 > > This updates the origin/* references to remote branches - but does not > delete locally checked out branches [if any] - they have to be > manually deleted [as mentioned in my instructions] Yes, but those are branches that a person has directly interacted with. The many other branches would be quietly pruned.
Re: [petsc-dev] git repo branches housekeeping
On Mon, 1 Apr 2019, Jed Brown via petsc-dev wrote: > "Smith, Barry F. via petsc-dev" writes: > > >This is, IMHO, a weakness of git. It is crazy to impose this type of > > housekeeping directly on all 1000 users of a repository. > > Perhaps this should be the default: > > git config --global fetch.prune true or use 'git fetch -p' [ mentioned in my instructions]. I prefer 'fetch' to 'pull' anyway [as it keeps my git prompt sane] - so this works out well for me. > > But, it would make it harder to recover if someone accidentally deletes > a branch on the server. > > https://stackoverflow.com/a/40842589/33208 This updates the origin/* references to remote branches - but does not delete locally checked out branches [if any] - they have to be manually deleted [as mentioned in my instructions] Satish
Re: [petsc-dev] git repo branches housekeeping
"Smith, Barry F. via petsc-dev" writes: >This is, IMHO, a weakness of git. It is crazy to impose this type of > housekeeping directly on all 1000 users of a repository. Perhaps this should be the default: git config --global fetch.prune true But, it would make it harder to recover if someone accidentally deletes a branch on the server. https://stackoverflow.com/a/40842589/33208
Re: [petsc-dev] git repo branches housekeeping
"Balay, Satish via petsc-dev" writes: >> Would it make sense to make this cleanup in a regular basis? Once a PR is >> merged into master, what's the point of keeping the branch around until >> next release? It makes it heavier to search for a branch in Bitbucket, "git >> remote show origin" produces huge listing. >> I try hard myself of remembering to remove my merged branches, or select >> "close source branch" when I make the PR. > > Well I think the prior thought was - if some additional fixes are > needed to that branch after merge to master - its good to keep it > around. But I guess this use-case is rare.. Yeah, pretty rare and the branch name is mentioned in the merge commit so it can be recreated when needed. (Doing so is desirable because it allows in-development branches to obtain a bug fix without possibly unrelated features from 'master'.)
Re: [petsc-dev] git repo branches housekeeping
> On Apr 1, 2019, at 10:37 AM, Balay, Satish via petsc-dev > wrote: > > On Mon, 1 Apr 2019, Lisandro Dalcin wrote: > >> On Fri, 29 Mar 2019 at 19:22, Balay, Satish via petsc-dev < >> petsc-dev@mcs.anl.gov> wrote: >> >>> ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2018-April/022748.html >>> >>> I've deleted all development branches that are already merged into >>> maint (v3.11) from https://bitbucket.org/petsc/petsc >>> >>> >> Would it make sense to make this cleanup in a regular basis? Once a PR is >> merged into master, what's the point of keeping the branch around until >> next release? It makes it heavier to search for a branch in Bitbucket, "git >> remote show origin" produces huge listing. >> I try hard myself of remembering to remove my merged branches, or select >> "close source branch" when I make the PR. > > Well I think the prior thought was - if some additional fixes are > needed to that branch after merge to master - its good to keep it > around. But I guess this use-case is rare.. > > Also - this cleanup can be done perhaps easily on the server [by > someone who can check on it regularly - as doing this when closing PR > cannot be automated] - but folk would have to do this on their clones > too [as cleanup on the server does not automatically do cleanup in > clones]. This is, IMHO, a weakness of git. It is crazy to impose this type of housekeeping directly on all 1000 users of a repository. Barry > Satish
Re: [petsc-dev] git repo branches housekeeping
On Mon, 1 Apr 2019, Lisandro Dalcin wrote: > On Fri, 29 Mar 2019 at 19:22, Balay, Satish via petsc-dev < > petsc-dev@mcs.anl.gov> wrote: > > > ref: https://lists.mcs.anl.gov/pipermail/petsc-dev/2018-April/022748.html > > > > I've deleted all development branches that are already merged into > > maint (v3.11) from https://bitbucket.org/petsc/petsc > > > > > Would it make sense to make this cleanup in a regular basis? Once a PR is > merged into master, what's the point of keeping the branch around until > next release? It makes it heavier to search for a branch in Bitbucket, "git > remote show origin" produces huge listing. > I try hard myself of remembering to remove my merged branches, or select > "close source branch" when I make the PR. Well I think the prior thought was - if some additional fixes are needed to that branch after merge to master - its good to keep it around. But I guess this use-case is rare.. Also - this cleanup can be done perhaps easily on the server [by someone who can check on it regularly - as doing this when closing PR cannot be automated] - but folk would have to do this on their clones too [as cleanup on the server does not automatically do cleanup in clones]. Satish
Re: [petsc-dev] git repo branches housekeeping
On Wed, 12 Sep 2018, Balay, Satish wrote: > For more housekeeping - look at the remaining local and remote > branches and figure-out what to do. [perhaps some of them are > intermediate branches during rebase - or abandoned features that > should be deleted]. For reference - current list of remote branches Satish -- $ git branch -r |wc -l 272 $ git branch -r origin/BarryFSmith/readmemd-created-online-with-bitbucket-1506004176072 origin/Fande-Kong/generalize_hierarchical_partitioning_maint origin/Fande-Kong/hypre_mat_type origin/HEAD -> origin/master origin/adams/zeroDSOR origin/balay/atpesc-tutorial-2014-bgq origin/balay/atpesc-tutorial-2015-bgq origin/balay/atpesc-tutorial-2016-bgq origin/balay/atpesc18 origin/balay/fix-ctable-hash-again/maint origin/balay/fix-cxx-cmplx-single origin/balay/fix-rebuild-xsdktrilinos origin/balay/fix-superlu_dist-reuse-factornumeric1-maint-backport origin/balay/fix-uninstall origin/balay/giturl-fixes origin/balay/k-fujitsu-f90-v3.6 origin/balay/release-3.10-revert-to-dev origin/balay/test origin/balay/to-maint-switch-hdf5-build-to-cmake origin/balay/update-builder-test origin/balay/update-elemental-nov-2016 origin/balay/update-hdf5-1.10.2 origin/balay/update-strumpack-2.2.0 origin/barry-test origin/barry/combblas origin/barry/feature-baij-blockdiagonal-scale origin/barry/feature-petscviewerformat-register origin/barry/feature-snessetkspsetupcallback origin/barry/fix-zoltan-library-list/maint origin/barry/improve-secant-linesearch origin/barry/mg-presmooth-zero-initial-guess origin/barry/oana/spectral-toy-updates origin/barry/pyjac origin/barry/refactor-vecscatter-2 origin/barry/refactor-vecview origin/barry/saws-profile origin/barry/spectral-poisson origin/barry/ssisc-spectral-adjoint origin/bueler/clean-ex9 origin/dalcinl/fix-xaij-spd origin/dalcinl/math-isclose origin/dalcinl/ts-snes origin/damalbel/dmnetwork_nest origin/damalbel/dmnetwork_nest_fieldsplit origin/debo/mat-taij origin/debo/ts-fix-ex31 origin/debo/ts-irk origin/denera/mat-lmvm-symbrdn-rescaling-fix origin/denera/petsc-jenkins-integration origin/denera/snes-reasonview-indent-fix origin/denera/tao-anderson-multisecant origin/denera/tao-gauss-newton-wrapper origin/denera/tao-linesearch-redesign origin/denera/tao-lmvm-recycling-bounded-refactor origin/denera/tao-problem-type-infrastructure origin/denera/tao-six-hump-camel-problem origin/dmay/ksp-cvgtest-normtype-fix origin/emil/add-fortran-ts-pre-post-stage-step/maint origin/emil/fix-ts-dae-rebased-v2 origin/emil/ts-ex31-add-pg-example origin/emil/ts-steady-state-ex31 origin/hongzh/index1-dae origin/hongzh/remove-manual-unrolling origin/hongzh/swe origin/hongzh/timing_issue origin/hongzh/ts-adjoint2 origin/hongzh/ts-matshell-example origin/hongzh/vectorize-inner-products origin/hzhang/add-matcompress origin/hzhang/dmnetwork-couple origin/hzhang/fix-mpi3_unusedvar origin/hzhang/fix-ptaptest origin/hzhang/ksp-fminres origin/hzhang/ksp-minresqlp origin/hzhang/vec_node/master origin/hzhang/vec_node/master-rebased origin/irving/fe-scalars origin/irving/snes-ex12-cleanup origin/jczhang/feature-vecscatter-mpi3shmem origin/jczhang/feature-vecscatter-neighborhood origin/jczhang/optimize-double-agent-mpi origin/jczhang/optimize-on-node-matrix origin/jed/assembly-perf origin/jed/cray-externc origin/jed/defined-nocpp origin/jed/doc-xsetdm origin/jed/elbueler-snes-ex5-fixes origin/jed/feature-dmda-section origin/jed/feature-sf-local origin/jed/fix-dmplexdistribute-fortran origin/jed/fix-gpu-docs origin/jed/fix-mat-convert-basic-bs origin/jed/ksp-plugin origin/jed/make-lib-ordering origin/jed/mat-eigenvalue-cache origin/jed/mat-hash origin/jed/mat-kaij origin/jed/mat-taij origin/jed/matbaij-loop origin/jed/matzerorowscolumnslocal-null/maint origin/jed/mpi-2 origin/jed/next-seaice origin/jed/sr-driver origin/jed/sr-driver4 origin/jed/tao-status-string origin/jed/tap origin/jed/testsrcs-refresh origin/jed/ts-ex11-union origin/jed/ts-heat-plex origin/jed/vecghostgetvalues origin/john-saws-webosocket-update origin/john/saws-webui-upgrade origin/karlrupp/feature-fast-matmatmult origin/karlrupp/feature-optimize-opencl-petscfe origin/karlrupp/feature-pipelined-cg-viennacl origin/karlrupp/feature-viennacl-cuda origin/karlrupp/feature-viennacl-openmp origin/karlrupp/fix-viennacl-veccopy origin/karpeev/fix-pc-fieldsplit-reset origin/karpeev/mat-convert-nest-aij-test origin/karpeev/mat-reset origin/klaij/fieldsplit-simple-ex70 origin/knepley/feature-configure-kcomputer origin/knepley/feature-da-repartition origin/knepley/feature-dm-nearnullspace origin/knepley/feature-error-logging origin/knepley/feature-ksp-ex10-transpose origin/knepley/feature-nonlinear-convergence origin/knepley/feature-optcontrol-mg origin/knepley/fe
Re: [petsc-dev] git repo branches housekeeping
On Sun, 8 Apr 2018, Satish Balay wrote: > For more housekeeping - look at the remaining local and remote > branches and figure-out what to do. [perhaps some of them are > intermediate branches during rebase - or abandoned features that > should be deleted]. For reference - current list of remote branches Satish -- $ git branch -r |wc -l 265 $ git branch -r origin/BarryFSmith/readmemd-created-online-with-bitbucket-1506004176072 origin/HEAD -> origin/master origin/adams/zeroDSOR origin/balay/atpesc-tutorial-2014-bgq origin/balay/atpesc-tutorial-2015-bgq origin/balay/atpesc-tutorial-2016-bgq origin/balay/fix-ctable-hash-again/maint origin/balay/fix-cxx-cmplx-single origin/balay/fix-rebuild-xsdktrilinos origin/balay/fix-superlu_dist-reuse-factornumeric1-maint-backport origin/balay/fix-uninstall origin/balay/giturl-fixes origin/balay/k-fujitsu-f90-v3.6 origin/balay/test origin/balay/to-maint-switch-hdf5-build-to-cmake origin/balay/update-builder-test origin/balay/update-elemental-nov-2016 origin/barry-test origin/barry/clarify-dmplex-documentation origin/barry/feature-baij-blockdiagonal-scale origin/barry/feature-petscviewerformat-register origin/barry/fix-zoltan-library-list/maint origin/barry/improve-secant-linesearch origin/barry/oana/spectral-toy-updates origin/barry/pyjac origin/barry/refactor-vecview origin/barry/saws-profile origin/barry/spectral-poisson origin/barry/ssisc-spectral-adjoint origin/bueler/clean-ex9 origin/dalcinl/fix-xaij-spd origin/dalcinl/math-isclose origin/dalcinl/ts-snes origin/damalbel/dmnetwork_nest origin/damalbel/dmnetwork_nest_fieldsplit origin/debo/mat-taij origin/debo/ts-fix-ex31 origin/debo/ts-irk origin/denera/snes-reasonview-indent-fix origin/denera/tao-anderson-multisecant origin/denera/tao-bounded-newton origin/denera/tao-linesearch-redesign origin/denera/tao-lmvm-recycling-bounded-refactor origin/denera/tao-merge-pgd-into-bncg origin/denera/tao-separate-quadratic-solvers origin/dmay/ksp-cvgtest-normtype-fix origin/emil/add-fortran-ts-pre-post-stage-step/maint origin/emil/fix-ts-dae-rebased-v2 origin/emil/ts-steady-state-ex31 origin/haplav/feature-dmplex-distributed-hdf5-read origin/hongzh/change-memkind-default origin/hongzh/remove-manual-unrolling origin/hongzh/swe origin/hongzh/symplectic-integrator origin/hongzh/timing_issue origin/hongzh/ts-matshell-example origin/hongzh/vectorize-inner-products origin/hzhang/add-matcompress origin/hzhang/dmnetwork-couple origin/hzhang/fix-mpi3_unusedvar origin/hzhang/fix-ptaptest origin/hzhang/ksp-fminres origin/hzhang/ksp-minresqlp origin/hzhang/vec_node/master origin/hzhang/vec_node/master-rebased origin/irving/fe-scalars origin/irving/snes-ex12-cleanup origin/jczhang/feature-vecscatter-mpi3shmem origin/jczhang/optimize-on-node-matrix origin/jczhang/optimize-vecscatter-multi-copy origin/jed/assembly-perf origin/jed/cray-externc origin/jed/defined-nocpp origin/jed/doc-xsetdm origin/jed/elbueler-snes-ex5-fixes origin/jed/feature-dmda-section origin/jed/feature-sf-local origin/jed/fix-mat-convert-basic-bs origin/jed/ksp-plugin origin/jed/make-lib-ordering origin/jed/mat-eigenvalue-cache origin/jed/mat-hash origin/jed/mat-kaij origin/jed/mat-taij origin/jed/matbaij-loop origin/jed/matzerorowscolumnslocal-null/maint origin/jed/mpi-2 origin/jed/next-seaice origin/jed/sr-driver origin/jed/sr-driver4 origin/jed/tao-status-string origin/jed/tap origin/jed/testsrcs-refresh origin/jed/ts-ex11-union origin/jed/ts-heat-plex origin/jed/vecghostgetvalues origin/john-saws-webosocket-update origin/john/saws-webui-upgrade origin/karlrupp/feature-fast-matmatmult origin/karlrupp/feature-optimize-opencl-petscfe origin/karlrupp/feature-pipelined-cg-viennacl origin/karlrupp/feature-viennacl-cuda origin/karlrupp/feature-viennacl-openmp origin/karlrupp/fix-viennacl-veccopy origin/karpeev/fix-pc-fieldsplit-reset origin/karpeev/mat-convert-nest-aij-test origin/karpeev/mat-reset origin/klaij/fieldsplit-simple-ex70 origin/knepley/feature-configure-kcomputer origin/knepley/feature-da-repartition origin/knepley/feature-error-logging origin/knepley/feature-fe-nonaffine origin/knepley/feature-optcontrol-mg origin/knepley/feature-pc-patch origin/knepley/feature-plex-example-nonconforming origin/knepley/feature-plex-functionals origin/knepley/feature-plex-l2-projection origin/knepley/feature-plex-nasm origin/knepley/feature-plex-parallel-submesh origin/knepley/feature-plex-snesvi-example origin/knepley/feature-snes-ex13-spectral origin/knepley/feature-snes-rewrite origin/knepley/feature-spectral-solutions origin/knepley/fix-dm-gmg origin/knepley/fix-ex62-tests origin/knepley/fix-fe-bd-integral origin/knepley/fix-fe-vector-spaces origin/knepley/fix-plex-hdf5-periodic origin/knepley/fix-plex-pointfunc-d
Re: [petsc-dev] git repo branches housekeeping
On Wed, 2017-09-27 at 01:43 +, Balay, Satish wrote: > For more housekeeping - look at the remaining local and remote > branches and figure-out what to do. [perhaps some of them are > intermediate branches during rebase - or abandoned features that > should be deleted]. For my branches - I would do: For reference - current list of remote branches Satish -- $ git branch -r |wc -l 246 $ git branch -r origin/BarryFSmith/readmemd-created-online-with-bitbucket- 1506004176072 origin/Fande-Kong/fix_dtfe origin/Fande-Kong/fix_dtfe_default_setting origin/Fande-Kong/ksp_only_null_space origin/HEAD -> origin/master origin/adams/zeroDSOR origin/balay/add-dasub-f-interface/maint origin/balay/atpesc-tutorial-2014-bgq origin/balay/atpesc-tutorial-2015-bgq origin/balay/atpesc-tutorial-2016-bgq origin/balay/fix-ctable-hash-again/maint origin/balay/fix-cxx-cmplx-single origin/balay/fix-rebuild-xsdktrilinos origin/balay/fix-superlu_dist-reuse-factornumeric1-maint-backport origin/balay/fix-uninstall origin/balay/giturl-fixes origin/balay/k-fujitsu-f90-v3.6 origin/balay/to-maint-switch-hdf5-build-to-cmake origin/balay/update-elemental-nov-2016 origin/barry/check-no-autodetect-first origin/barry/cleanup-checkclibraries origin/barry/feature-enhanced-binary-viewers origin/barry/fix-gamg-asm-aggs origin/barry/fix-gamg-asm-aggs-donottouch origin/barry/fix-hypre-struct origin/barry/fix-petscviewer-attempt-1 origin/barry/fix-scalapack-pic/maint origin/barry/fix-suffixed-constants-quad origin/barry/fix-threadsafety-mpi-key-value-create origin/barry/fix-xsdk-0.2.0-rc2 origin/barry/force-use-of-ksperrorifnotconverged origin/barry/generate-base-performance-data origin/barry/html origin/barry/improve-secant-linesearch origin/barry/new-test-makefiles origin/barry/newhtml origin/barry/oana/spectral-toy-updates origin/barry/pyjac origin/barry/saws-profile origin/barry/spectral-toy origin/barry/superlu_mt origin/barry/support-dmcreatedomaindecompositionscatters-da- nonperiodic-maint origin/barry/this-is-strange origin/barry/ts-nonnegative-values origin/barry/utilize-hwloc origin/barry/utilize-hwloc-rebased origin/bueler/clean-ex9 origin/dalcinl/add-tsrestart origin/dalcinl/fix-dmplex-draw origin/dalcinl/fix-xaij-spd origin/dalcinl/malloc-coalesced origin/dalcinl/math-isclose origin/dalcinl/ts-adapt-dsp origin/dalcinl/ts-snes origin/damalbel/dmnetwork_nest origin/damalbel/dmnetwork_nest_fieldsplit origin/debo/mat-taij origin/debo/ts-fix-ex31 origin/debo/ts-irk origin/dmay/ksp-cvgtest-normtype-fix origin/emil/add-fortran-ts-pre-post-stage-step/maint origin/emil/fix-ts-dae-rebased-v2 origin/emil/ts-steady-state-ex31 origin/hongzh/add-ell-format origin/hongzh/copy_l2g_stencil origin/hongzh/remove-manual-unrolling origin/hongzh/swe origin/hongzh/symplectic-integrator origin/hongzh/ts-matshell-example origin/hzhang/dmnetwork-couple origin/hzhang/fix-ptaptest origin/hzhang/ksp-fminres origin/hzhang/ksp-minresqlp origin/hzhang/opt-mattransposematmult origin/hzhang/subnetworks-couple origin/irving/fe-scalars origin/irving/snes-ex12-cleanup origin/jed/assembly-perf origin/jed/cray-externc origin/jed/defined-nocpp origin/jed/elbueler-snes-ex5-fixes origin/jed/feature-dmda-section origin/jed/feature-sf-local origin/jed/fix-mat-convert-basic-bs origin/jed/ksp-plugin origin/jed/mat-eigenvalue-cache origin/jed/mat-hash origin/jed/mat-kaij origin/jed/mat-taij origin/jed/mpi-2 origin/jed/next-seaice origin/jed/sr-driver origin/jed/sr-driver4 origin/jed/tao-status-string origin/jed/tap origin/jed/testsrcs-refresh origin/jed/ts-ex11-union origin/jed/ts-heat-plex origin/jed/variadic-malloc origin/jed/vecghostgetvalues origin/john-saws-webosocket-update origin/john/saws-webui-upgrade origin/jose/lapack-check origin/karlrupp/feature-fast-matmatmult origin/karlrupp/feature-optimize-opencl-petscfe origin/karlrupp/feature-pipelined-cg-viennacl origin/karlrupp/feature-viennacl-cuda origin/karlrupp/feature-viennacl-openmp origin/karlrupp/fix-tao-examples origin/karlrupp/fix-viennacl-veccopy origin/karpeev/fix-pc-fieldsplit-reset origin/karpeev/mat-convert-nest-aij-test origin/karpeev/mat-reset origin/klaij/fieldsplit-simple-ex70 origin/knepley/feature-configure-kcomputer origin/knepley/feature-da-repartition origin/knepley/feature-fe-nonaffine origin/knepley/feature-optcontrol-mg origin/knepley/feature-plasma-example origin/knepley/feature-plex-box-mesh origin/knepley/feature-plex-example-nonconforming origin/knepley/feature-plex-nasm origin/knepley/feature-plex-snesvi-example origin/knepley/feature-rigid-bodies origin/knepley/feature-snes-rewrite origin/knepley/feature-spectral-solutions origin/knepley/fix-cohesive-orientation origin/knepley/fix-quadrature-order origin/knepley/ibamr origin/knepley/
Re: [petsc-dev] git repo branches housekeeping
On Mon, 25 Apr 2016, Satish Balay wrote: > For more housekeeping - look at the remaining local and remote > branches and figure-out what to do. [perhaps some of them are > intermediate branches during rebase - or abandoned features that > should be deleted]. For my branches - I would do: For reference - current list of remote branches Satish --- $ git branch -r |wc -l 196 $ git branch -r origin/HEAD -> origin/master origin/PICell origin/adams/zeroDSOR origin/balay/atpesc-tutorial-2014-bgq origin/balay/atpesc-tutorial-2015-bgq origin/balay/fix-cxx-cmplx-single origin/balay/fix-uninstall origin/balay/giturl-fixes origin/balay/to-maint-switch-hdf5-build-to-cmake origin/balay/update-cmake-3.3 origin/balay/update-hdf5-netcdf origin/barry/check-no-autodetect-first origin/barry/cleanup-checkclibraries origin/barry/feature-enhanced-binary-viewers origin/barry/fix-petscviewer-attempt-1 origin/barry/fix-some-clang-warnings origin/barry/fix-threadsafety-mpi-key-value-create origin/barry/html origin/barry/more-tchem-work origin/barry/new-test-makefiles origin/barry/newhtml origin/barry/saws-profile origin/barry/superlu_mt origin/barry/utilize-hwloc origin/bueler/clean-ex9 origin/dalcinl/fix-xaij-spd origin/dalcinl/malloc-coalesced origin/dalcinl/ts-exactfinaltime origin/debo/mat-taij origin/debo/ts-fix-ex31 origin/debo/ts-irk origin/dmay/ksp-cvgtest-normtype-fix origin/emil/fix-ts-dae-rebased-v2 origin/emil/ts-glee origin/hongzh/ts-direct-sa origin/hongzh/ts-matshell-example origin/hzhang/dmnetwork-spJacobian3 origin/hzhang/fix-ptaptest origin/hzhang/ksp-fminres origin/hzhang/ksp-minresqlp origin/hzhang/superlu_dist-4.3-erroriffpe origin/irving/fe-scalars origin/irving/snes-ex12-cleanup origin/jed/assembly-perf origin/jed/cray-externc origin/jed/defined-nocpp origin/jed/elbueler-snes-ex5-fixes origin/jed/feature-dmda-section origin/jed/feature-sf-local origin/jed/fix-mat-convert-basic-bs origin/jed/fix-matnorm-log-flops origin/jed/ksp-plugin origin/jed/mat-eigenvalue-cache origin/jed/mat-taij origin/jed/mpi-2 origin/jed/next-seaice origin/jed/sr-driver origin/jed/sr-driver4 origin/jed/tao-status-string origin/jed/tap origin/jed/ts-ex11-union origin/jed/ts-heat-plex origin/jed/vecghostgetvalues origin/john-saws-webosocket-update origin/john/saws-webui-upgrade origin/jose/lapack-check origin/karlrupp/feature-optimize-opencl-petscfe origin/karlrupp/feature-pipelined-cg-viennacl origin/karlrupp/feature-viennacl-cuda origin/karlrupp/feature-viennacl-openmp origin/karlrupp/fix-viennacl-veccopy origin/karpeev/fix-pc-fieldsplit-reset origin/karpeev/mat-convert-nest-aij-test origin/karpeev/mat-reset origin/klaij/fieldsplit-simple-ex70 origin/knepley/feature-configure-kcomputer origin/knepley/feature-da-repartition origin/knepley/feature-fe-nonaffine origin/knepley/feature-optcontrol-mg origin/knepley/feature-parallel-mesh-load origin/knepley/feature-plex-example-nonconforming origin/knepley/feature-plex-nasm origin/knepley/feature-spectral-solutions origin/knepley/feature-ts-mass-matrix origin/knepley/fix-cohesive-orientation origin/knepley/fix-quadrature-order origin/knepley/pylith origin/knepley/swarm origin/madams/ex56params origin/madams/sor-residual origin/madams/sr-driver origin/madams/sr-driver2 origin/madams/sr-driver4 origin/madams/sr1 origin/maint origin/maint-3.2 origin/maint-3.3 origin/maint-3.4 origin/maint-3.5 origin/maint-3.6 origin/maint-tao-2.2 origin/mark/dmshell-ltogmap origin/mark/dmshell-test origin/mark/feature-picell origin/mark/feature-picell-iter origin/mark/gamg-coarse_ksp origin/mark/gamg-squarefix origin/mark/gamg-zerod origin/mark/ksp-zero-its origin/mark/schur-D origin/mark/tsex11 origin/master origin/master-tao origin/mlange/feature-plex-case origin/mlange/feature-plex-create-parallel origin/mlange/feature-plex-med origin/mlange/feature-plex-triangle origin/mlange/fix-adjacency-performance origin/mlange/fix-plex-cas-tests origin/mlange/fix-plex-hex-mesh origin/mlange/plex-create-parallel origin/mlange/plex-distributed-overlap origin/mlange/plex-hybrid-hdf5 origin/mlange/plex-redistribute origin/mlange/plex-sfc-reordering origin/mlange/plex-vertex-partitioning origin/mlange05/fix-gmsh-coordinates origin/next origin/next-apr-2016 origin/next-jun-2015 origin/next-oct-2014 origin/paulmullowney/aijcusp-ellpack-fix origin/peller/threadcomm origin/pr118/asmunder/DMDA-fortran-example/master 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/sf-examplefix origin/prbrune/snes-ex19vtkoutput origin/prbrune
Re: [petsc-dev] git repo branches housekeeping
http://stackoverflow.com/questions/12495756/why-doesnt-git-allow-me-to-safely-delete-a-branch/12520718 Ah - I think you've done the following (or equivalent)- so git is complaining. git checkout barry/download-mstk git commit [did not do 'git push'] git checkout master git merge barry/download-mstk Since these branches are already merged to 3.7 - and also deleted on remote/server - you can 'force delete' the local ones. git branch -D barry/download-mstk shri/add-tsevent-to-powergrid-examples [also 'git fetch -p'] Satish On Mon, 25 Apr 2016, Barry Smith wrote: > > $ git log v3.7..shri/add-tsevent-to-powergrid-example > fatal: ambiguous argument 'v3.7..shri/add-tsevent-to-powergrid-example': > unknown revision or path not in the working tree. > Use '--' to separate paths from revisions, like this: > 'git [...] -- [...]' > ~/Src/petsc (next=) > $ git log v3.7..barry/download-mstk > ~/Src/petsc (next=) > > > > > On Apr 25, 2016, at 1:12 PM, Satish Balay wrote: > > > > What do you have for > > > > git fetch > > git log v3.7..barry/download-mstk > > got lpg v3.7..shri/add-tsevent-to-powergrid-examples > > > > Satish > > > > On Mon, 25 Apr 2016, Barry Smith wrote: > > > >> > >> warning: not deleting branch 'barry/download-mstk' that is not yet merged > >> to > >> 'refs/remotes/origin/barry/download-mstk', even though it is > >> merged to HEAD. > >> error: The branch 'barry/download-mstk' is not fully merged. > >> If you are sure you want to delete it, run 'git branch -D > >> barry/download-mstk'. > >> > >> > >> warning: not deleting branch 'shri/add-tsevent-to-powergrid-examples' that > >> is not yet merged to > >> 'refs/remotes/origin/shri/add-tsevent-to-powergrid-examples', even > >> though it is merged to HEAD. > >> error: The branch 'shri/add-tsevent-to-powergrid-examples' is not fully > >> merged. > >> If you are sure you want to delete it, run 'git branch -D > >> shri/add-tsevent-to-powergrid-examples'. > >> > >> > >>> On Apr 25, 2016, at 12:01 PM, Satish Balay wrote: > >>> > >>> ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017808.html > >>> > >>> I've deleted all deveopment branches that are already merged into > >>> maint (v3.7) from https://bitbucket.org/petsc/petsc > >>> > >>> However if you wish to remove these branches from your clone - it has > >>> to be done manually (in each clone). > >>> > >>> To get this list of branches to delete - you can do: > >>> > >>> git branch --merged v3.7 |egrep -v " (maint|master|next)" > > >>> branches_to_delete > >>> > >>> After *verifying* the list is correct - and ok to delete - they can be > >>> deleted with: > >>> > >>> git branch -d `cat branches_to_delete` > >>> > >>> And to sync the [deleted] remove branch list info - you can do: > >>> > >>> git fetch -p > >>> > >>> For more housekeeping - look at the remaining local and remote > >>> branches and figure-out what to do. [perhaps some of them are > >>> intermediate branches during rebase - or abandoned features that > >>> should be deleted]. For my branches - I would do: > >>> > >>> git branch > >>> git branch -r |grep balay > >>> > >>> Satish > >>> > >>> reference for self: > >>> $ git branch -r --merged v3.7 |egrep -v origin/\(maint\|master\|next\) > >>> |sed -e s%origin/%:% > remote_branches_to_delete > >>> $ git push -u origin `cat remote_branches_to_delete` > >>> To g...@bitbucket.org:petsc/petsc.git > >>> - [deleted] Fande-Kong/moved-partitioning-to-pcgasmsetup > >>> - [deleted] balay-to-maint-fix-vs2015-vsnprintf > >>> - [deleted] balay/add-KSPComputeRitz-patch > >>> - [deleted] balay/add-clang-sa-build > >>> - [deleted] balay/add-fortran-DMRemoveLabel > >>> - [deleted] balay/configure-pkg-git-autoupdate > >>> - [deleted] balay/el-parmetis-check > >>> - [deleted] balay/el_AxpyInterface_removal > >>> - [deleted] balay/fix-externalpackage-build-shared > >>> - [deleted] balay/fix-fortran-unused_variables > >>> - [deleted] balay/fix-sowing-valgrind > >>> - [deleted] balay/fix-streams-npmax > >>> - [deleted] balay/fix-win-isnan > >>> - [deleted] balay/ftn-command_argument > >>> - [deleted] balay/git-externalpackage-update > >>> - [deleted] balay/improve-odpes > >>> - [deleted] balay/rm-tree > >>> - [deleted] balay/superlu_dist-4.3 > >>> - [deleted] balay/superlu_dist-4.3-p1 > >>> - [deleted] balay/to-maint-add-mpiuni_mpi_in_place > >>> - [deleted] balay/to-maint-add-urlretrieve-timeout > >>> - [deleted] balay/to-maint-fix-fortran-fflag-order > >>> - [deleted] balay/to-maint-fix-gfortran51-warnings > >>> - [deleted] balay/to-maint-fix-win64-long > >>> - [deleted] balay/to-maint-metis-parmetis-nocxx > >>> - [deleted] balay/to-maint-migrate-builds > >>> - [deleted] balay/to-maint/update-superlu_dist-4.1
Re: [petsc-dev] git repo branches housekeeping
Barry Smith writes: > $ git log v3.7..shri/add-tsevent-to-powergrid-example > fatal: ambiguous argument 'v3.7..shri/add-tsevent-to-powergrid-example': > unknown revision or path not in the working tree. You misspelled the branch name (it's plural). >> got lpg v3.7..shri/add-tsevent-to-powergrid-examples signature.asc Description: PGP signature
Re: [petsc-dev] git repo branches housekeeping
$ git log v3.7..shri/add-tsevent-to-powergrid-example fatal: ambiguous argument 'v3.7..shri/add-tsevent-to-powergrid-example': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' ~/Src/petsc (next=) $ git log v3.7..barry/download-mstk ~/Src/petsc (next=) > On Apr 25, 2016, at 1:12 PM, Satish Balay wrote: > > What do you have for > > git fetch > git log v3.7..barry/download-mstk > got lpg v3.7..shri/add-tsevent-to-powergrid-examples > > Satish > > On Mon, 25 Apr 2016, Barry Smith wrote: > >> >> warning: not deleting branch 'barry/download-mstk' that is not yet merged to >> 'refs/remotes/origin/barry/download-mstk', even though it is merged >> to HEAD. >> error: The branch 'barry/download-mstk' is not fully merged. >> If you are sure you want to delete it, run 'git branch -D >> barry/download-mstk'. >> >> >> warning: not deleting branch 'shri/add-tsevent-to-powergrid-examples' that >> is not yet merged to >> 'refs/remotes/origin/shri/add-tsevent-to-powergrid-examples', even >> though it is merged to HEAD. >> error: The branch 'shri/add-tsevent-to-powergrid-examples' is not fully >> merged. >> If you are sure you want to delete it, run 'git branch -D >> shri/add-tsevent-to-powergrid-examples'. >> >> >>> On Apr 25, 2016, at 12:01 PM, Satish Balay wrote: >>> >>> ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017808.html >>> >>> I've deleted all deveopment branches that are already merged into >>> maint (v3.7) from https://bitbucket.org/petsc/petsc >>> >>> However if you wish to remove these branches from your clone - it has >>> to be done manually (in each clone). >>> >>> To get this list of branches to delete - you can do: >>> >>> git branch --merged v3.7 |egrep -v " (maint|master|next)" > >>> branches_to_delete >>> >>> After *verifying* the list is correct - and ok to delete - they can be >>> deleted with: >>> >>> git branch -d `cat branches_to_delete` >>> >>> And to sync the [deleted] remove branch list info - you can do: >>> >>> git fetch -p >>> >>> For more housekeeping - look at the remaining local and remote >>> branches and figure-out what to do. [perhaps some of them are >>> intermediate branches during rebase - or abandoned features that >>> should be deleted]. For my branches - I would do: >>> >>> git branch >>> git branch -r |grep balay >>> >>> Satish >>> >>> reference for self: >>> $ git branch -r --merged v3.7 |egrep -v origin/\(maint\|master\|next\) >>> |sed -e s%origin/%:% > remote_branches_to_delete >>> $ git push -u origin `cat remote_branches_to_delete` >>> To g...@bitbucket.org:petsc/petsc.git >>> - [deleted] Fande-Kong/moved-partitioning-to-pcgasmsetup >>> - [deleted] balay-to-maint-fix-vs2015-vsnprintf >>> - [deleted] balay/add-KSPComputeRitz-patch >>> - [deleted] balay/add-clang-sa-build >>> - [deleted] balay/add-fortran-DMRemoveLabel >>> - [deleted] balay/configure-pkg-git-autoupdate >>> - [deleted] balay/el-parmetis-check >>> - [deleted] balay/el_AxpyInterface_removal >>> - [deleted] balay/fix-externalpackage-build-shared >>> - [deleted] balay/fix-fortran-unused_variables >>> - [deleted] balay/fix-sowing-valgrind >>> - [deleted] balay/fix-streams-npmax >>> - [deleted] balay/fix-win-isnan >>> - [deleted] balay/ftn-command_argument >>> - [deleted] balay/git-externalpackage-update >>> - [deleted] balay/improve-odpes >>> - [deleted] balay/rm-tree >>> - [deleted] balay/superlu_dist-4.3 >>> - [deleted] balay/superlu_dist-4.3-p1 >>> - [deleted] balay/to-maint-add-mpiuni_mpi_in_place >>> - [deleted] balay/to-maint-add-urlretrieve-timeout >>> - [deleted] balay/to-maint-fix-fortran-fflag-order >>> - [deleted] balay/to-maint-fix-gfortran51-warnings >>> - [deleted] balay/to-maint-fix-win64-long >>> - [deleted] balay/to-maint-metis-parmetis-nocxx >>> - [deleted] balay/to-maint-migrate-builds >>> - [deleted] balay/to-maint/update-superlu_dist-4.1 >>> - [deleted] balay/update-elemental-0.86-pre >>> - [deleted] balay/update-gmake-check >>> - [deleted] balay/update-gnumake-41 >>> - [deleted] balay/update-metis-xcode-fix-to-maint >>> - [deleted] balay/update-mpich-3.2 >>> - [deleted] balay/update-sowing-svn >>> - [deleted] balay/update-superlu_dist_mar-16-294e2d0 >>> - [deleted] barry-allow-vecset-nan-3.6 >>> - [deleted] barry/Sylvain-gmres-symmetric >>> - [deleted] barry/add-concurrencykit >>> - [deleted] barry/add-dmdavecgetarrayreadf90/maint >>> - [deleted] barry/add-dmshellcreaterestriction >>> - [deleted] barry/add-mpiu_allreduce >>> - [deleted] barry/add-pcfieldsplit-logevent >>> - [deleted] barry/add-pcreset-
Re: [petsc-dev] git repo branches housekeeping
On Mon, 25 Apr 2016, Jed Brown wrote: > Matthew Knepley writes: > > > I just get > > > > maint $:/PETSc3/petsc/petsc-dev$ git branch --merged v3.7 > > git branch --merged v3.7 > > knepley/feature-configuration-callbacks > > > > which is the one branch I have leftover here. Is that what I am supposed to > > get? Only one branch? Perhaps you were doing housekeeping regularly [deleting local feature branches after they were merged to master] Also this one appears to be an intermediate branch that was never pushed to remote - but was perhaps merged to a different feature branch - and then to master] > Yes. I had a few others because I hadn't cleaned up recently. If you > had been testing every PR, you would have had something like the full > list that Satish mentioned. The full list was the list of branches I deleted on the server. Locally I have only a fraction of the branches [all of my branches (some local/temporary), and a few of other developer branches to which I might have pushed fixes for]. Here is the small list of local branches that I deleted from my clone. $ cat branches_to_delete balay/add-KSPComputeRitz-patch balay/add-clang-sa-build balay/add-fortran-DMRemoveLabel balay/configure-pkg-git-autoupdate balay/el-parmetis-check balay/el_AxpyInterface_removal balay/fix-externalpackage-build-shared balay/fix-fortran-unused_variables balay/fix-streams-npmax balay/git-externalpackage-update balay/improve-odpes balay/superlu_dist-4.3 balay/superlu_dist-4.3-p1 balay/to-maint-add-mpiuni_mpi_in_place balay/to-maint-metis-parmetis-nocxx balay/update-elemental-0.86-pre balay/update-gmake-check balay/update-metis-xcode-fix-to-maint balay/update-mpich-3.2 balay/update-superlu_dist_mar-16-294e2d0 barry/download-pflowtran barry/downloads barry/fix-dmnetworkcomponentalignment barry/monitor-fromoptions barry/update-hypre barry/update-superlu_dist hzhang/matpackage-erroriffpe hzhang/matpackage-type hzhang/superlu-5.1 hzhang/update-networkex knepley/fix-configure-saving release-3.7 sarich/fix-xsdk-packages shri/update-tsevent test tisaac/dmforest tisaac/dmp4est-feature-injection Satish
Re: [petsc-dev] git repo branches housekeeping
What do you have for git fetch git log v3.7..barry/download-mstk got lpg v3.7..shri/add-tsevent-to-powergrid-examples Satish On Mon, 25 Apr 2016, Barry Smith wrote: > > warning: not deleting branch 'barry/download-mstk' that is not yet merged to > 'refs/remotes/origin/barry/download-mstk', even though it is merged > to HEAD. > error: The branch 'barry/download-mstk' is not fully merged. > If you are sure you want to delete it, run 'git branch -D > barry/download-mstk'. > > > warning: not deleting branch 'shri/add-tsevent-to-powergrid-examples' that is > not yet merged to > 'refs/remotes/origin/shri/add-tsevent-to-powergrid-examples', even > though it is merged to HEAD. > error: The branch 'shri/add-tsevent-to-powergrid-examples' is not fully > merged. > If you are sure you want to delete it, run 'git branch -D > shri/add-tsevent-to-powergrid-examples'. > > > > On Apr 25, 2016, at 12:01 PM, Satish Balay wrote: > > > > ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017808.html > > > > I've deleted all deveopment branches that are already merged into > > maint (v3.7) from https://bitbucket.org/petsc/petsc > > > > However if you wish to remove these branches from your clone - it has > > to be done manually (in each clone). > > > > To get this list of branches to delete - you can do: > > > > git branch --merged v3.7 |egrep -v " (maint|master|next)" > > > branches_to_delete > > > > After *verifying* the list is correct - and ok to delete - they can be > > deleted with: > > > > git branch -d `cat branches_to_delete` > > > > And to sync the [deleted] remove branch list info - you can do: > > > > git fetch -p > > > > For more housekeeping - look at the remaining local and remote > > branches and figure-out what to do. [perhaps some of them are > > intermediate branches during rebase - or abandoned features that > > should be deleted]. For my branches - I would do: > > > > git branch > > git branch -r |grep balay > > > > Satish > > > > reference for self: > > $ git branch -r --merged v3.7 |egrep -v origin/\(maint\|master\|next\) > > |sed -e s%origin/%:% > remote_branches_to_delete > > $ git push -u origin `cat remote_branches_to_delete` > > To g...@bitbucket.org:petsc/petsc.git > > - [deleted] Fande-Kong/moved-partitioning-to-pcgasmsetup > > - [deleted] balay-to-maint-fix-vs2015-vsnprintf > > - [deleted] balay/add-KSPComputeRitz-patch > > - [deleted] balay/add-clang-sa-build > > - [deleted] balay/add-fortran-DMRemoveLabel > > - [deleted] balay/configure-pkg-git-autoupdate > > - [deleted] balay/el-parmetis-check > > - [deleted] balay/el_AxpyInterface_removal > > - [deleted] balay/fix-externalpackage-build-shared > > - [deleted] balay/fix-fortran-unused_variables > > - [deleted] balay/fix-sowing-valgrind > > - [deleted] balay/fix-streams-npmax > > - [deleted] balay/fix-win-isnan > > - [deleted] balay/ftn-command_argument > > - [deleted] balay/git-externalpackage-update > > - [deleted] balay/improve-odpes > > - [deleted] balay/rm-tree > > - [deleted] balay/superlu_dist-4.3 > > - [deleted] balay/superlu_dist-4.3-p1 > > - [deleted] balay/to-maint-add-mpiuni_mpi_in_place > > - [deleted] balay/to-maint-add-urlretrieve-timeout > > - [deleted] balay/to-maint-fix-fortran-fflag-order > > - [deleted] balay/to-maint-fix-gfortran51-warnings > > - [deleted] balay/to-maint-fix-win64-long > > - [deleted] balay/to-maint-metis-parmetis-nocxx > > - [deleted] balay/to-maint-migrate-builds > > - [deleted] balay/to-maint/update-superlu_dist-4.1 > > - [deleted] balay/update-elemental-0.86-pre > > - [deleted] balay/update-gmake-check > > - [deleted] balay/update-gnumake-41 > > - [deleted] balay/update-metis-xcode-fix-to-maint > > - [deleted] balay/update-mpich-3.2 > > - [deleted] balay/update-sowing-svn > > - [deleted] balay/update-superlu_dist_mar-16-294e2d0 > > - [deleted] barry-allow-vecset-nan-3.6 > > - [deleted] barry/Sylvain-gmres-symmetric > > - [deleted] barry/add-concurrencykit > > - [deleted] barry/add-dmdavecgetarrayreadf90/maint > > - [deleted] barry/add-dmshellcreaterestriction > > - [deleted] barry/add-mpiu_allreduce > > - [deleted] barry/add-pcfieldsplit-logevent > > - [deleted] barry/add-pcreset-hypre > > - [deleted] barry/add-pcreset-hypre-for-master > > - [deleted] barry/all-petscoptionssetvalue-beforepetscinitialize > > - [deleted] barry/always-mark-floats > > - [deleted] barry/better-matsetoption-error > > - [deleted] barry/check-for-PetscInt-overflow > > - [deleted] barry/check-nullspace-properties > > - [deleted] barry/cleanup-pcsetupcalled > > - [deleted
Re: [petsc-dev] git repo branches housekeeping
warning: not deleting branch 'barry/download-mstk' that is not yet merged to 'refs/remotes/origin/barry/download-mstk', even though it is merged to HEAD. error: The branch 'barry/download-mstk' is not fully merged. If you are sure you want to delete it, run 'git branch -D barry/download-mstk'. warning: not deleting branch 'shri/add-tsevent-to-powergrid-examples' that is not yet merged to 'refs/remotes/origin/shri/add-tsevent-to-powergrid-examples', even though it is merged to HEAD. error: The branch 'shri/add-tsevent-to-powergrid-examples' is not fully merged. If you are sure you want to delete it, run 'git branch -D shri/add-tsevent-to-powergrid-examples'. > On Apr 25, 2016, at 12:01 PM, Satish Balay wrote: > > ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017808.html > > I've deleted all deveopment branches that are already merged into > maint (v3.7) from https://bitbucket.org/petsc/petsc > > However if you wish to remove these branches from your clone - it has > to be done manually (in each clone). > > To get this list of branches to delete - you can do: > > git branch --merged v3.7 |egrep -v " (maint|master|next)" > branches_to_delete > > After *verifying* the list is correct - and ok to delete - they can be > deleted with: > > git branch -d `cat branches_to_delete` > > And to sync the [deleted] remove branch list info - you can do: > > git fetch -p > > For more housekeeping - look at the remaining local and remote > branches and figure-out what to do. [perhaps some of them are > intermediate branches during rebase - or abandoned features that > should be deleted]. For my branches - I would do: > > git branch > git branch -r |grep balay > > Satish > > reference for self: > $ git branch -r --merged v3.7 |egrep -v origin/\(maint\|master\|next\) |sed > -e s%origin/%:% > remote_branches_to_delete > $ git push -u origin `cat remote_branches_to_delete` > To g...@bitbucket.org:petsc/petsc.git > - [deleted] Fande-Kong/moved-partitioning-to-pcgasmsetup > - [deleted] balay-to-maint-fix-vs2015-vsnprintf > - [deleted] balay/add-KSPComputeRitz-patch > - [deleted] balay/add-clang-sa-build > - [deleted] balay/add-fortran-DMRemoveLabel > - [deleted] balay/configure-pkg-git-autoupdate > - [deleted] balay/el-parmetis-check > - [deleted] balay/el_AxpyInterface_removal > - [deleted] balay/fix-externalpackage-build-shared > - [deleted] balay/fix-fortran-unused_variables > - [deleted] balay/fix-sowing-valgrind > - [deleted] balay/fix-streams-npmax > - [deleted] balay/fix-win-isnan > - [deleted] balay/ftn-command_argument > - [deleted] balay/git-externalpackage-update > - [deleted] balay/improve-odpes > - [deleted] balay/rm-tree > - [deleted] balay/superlu_dist-4.3 > - [deleted] balay/superlu_dist-4.3-p1 > - [deleted] balay/to-maint-add-mpiuni_mpi_in_place > - [deleted] balay/to-maint-add-urlretrieve-timeout > - [deleted] balay/to-maint-fix-fortran-fflag-order > - [deleted] balay/to-maint-fix-gfortran51-warnings > - [deleted] balay/to-maint-fix-win64-long > - [deleted] balay/to-maint-metis-parmetis-nocxx > - [deleted] balay/to-maint-migrate-builds > - [deleted] balay/to-maint/update-superlu_dist-4.1 > - [deleted] balay/update-elemental-0.86-pre > - [deleted] balay/update-gmake-check > - [deleted] balay/update-gnumake-41 > - [deleted] balay/update-metis-xcode-fix-to-maint > - [deleted] balay/update-mpich-3.2 > - [deleted] balay/update-sowing-svn > - [deleted] balay/update-superlu_dist_mar-16-294e2d0 > - [deleted] barry-allow-vecset-nan-3.6 > - [deleted] barry/Sylvain-gmres-symmetric > - [deleted] barry/add-concurrencykit > - [deleted] barry/add-dmdavecgetarrayreadf90/maint > - [deleted] barry/add-dmshellcreaterestriction > - [deleted] barry/add-mpiu_allreduce > - [deleted] barry/add-pcfieldsplit-logevent > - [deleted] barry/add-pcreset-hypre > - [deleted] barry/add-pcreset-hypre-for-master > - [deleted] barry/all-petscoptionssetvalue-beforepetscinitialize > - [deleted] barry/always-mark-floats > - [deleted] barry/better-matsetoption-error > - [deleted] barry/check-for-PetscInt-overflow > - [deleted] barry/check-nullspace-properties > - [deleted] barry/cleanup-pcsetupcalled > - [deleted] barry/cleanup-petscsys > - [deleted] barry/download-mstk > - [deleted] barry/download-pflowtran > - [deleted] barry/downloads > - [deleted] barry/error-on-extern-c-of-petscincludes > - [deleted] barry/feature-force-setting-exactfinaltime > - [deleted] barry/feature-linesearch-monitor > - [deleted] barry/feature-ts-monitor-
Re: [petsc-dev] git repo branches housekeeping
Matthew Knepley writes: > I just get > > maint $:/PETSc3/petsc/petsc-dev$ git branch --merged v3.7 > git branch --merged v3.7 > knepley/feature-configuration-callbacks > > which is the one branch I have leftover here. Is that what I am supposed to > get? Yes. I had a few others because I hadn't cleaned up recently. If you had been testing every PR, you would have had something like the full list that Satish mentioned. signature.asc Description: PGP signature
Re: [petsc-dev] git repo branches housekeeping
On Mon, Apr 25, 2016 at 12:01 PM, Satish Balay wrote: > ref: http://lists.mcs.anl.gov/pipermail/petsc-dev/2015-June/017808.html > > I've deleted all deveopment branches that are already merged into > maint (v3.7) from https://bitbucket.org/petsc/petsc > > However if you wish to remove these branches from your clone - it has > to be done manually (in each clone). > > To get this list of branches to delete - you can do: > > git branch --merged v3.7 |egrep -v " (maint|master|next)" > > branches_to_delete > I just get maint $:/PETSc3/petsc/petsc-dev$ git branch --merged v3.7 git branch --merged v3.7 knepley/feature-configuration-callbacks which is the one branch I have leftover here. Is that what I am supposed to get? Matt > After *verifying* the list is correct - and ok to delete - they can be > deleted with: > > git branch -d `cat branches_to_delete` > > And to sync the [deleted] remove branch list info - you can do: > > git fetch -p > > For more housekeeping - look at the remaining local and remote > branches and figure-out what to do. [perhaps some of them are > intermediate branches during rebase - or abandoned features that > should be deleted]. For my branches - I would do: > > git branch > git branch -r |grep balay > > Satish > > reference for self: > $ git branch -r --merged v3.7 |egrep -v origin/\(maint\|master\|next\) > |sed -e s%origin/%:% > remote_branches_to_delete > $ git push -u origin `cat remote_branches_to_delete` > To g...@bitbucket.org:petsc/petsc.git > - [deleted] Fande-Kong/moved-partitioning-to-pcgasmsetup > - [deleted] balay-to-maint-fix-vs2015-vsnprintf > - [deleted] balay/add-KSPComputeRitz-patch > - [deleted] balay/add-clang-sa-build > - [deleted] balay/add-fortran-DMRemoveLabel > - [deleted] balay/configure-pkg-git-autoupdate > - [deleted] balay/el-parmetis-check > - [deleted] balay/el_AxpyInterface_removal > - [deleted] balay/fix-externalpackage-build-shared > - [deleted] balay/fix-fortran-unused_variables > - [deleted] balay/fix-sowing-valgrind > - [deleted] balay/fix-streams-npmax > - [deleted] balay/fix-win-isnan > - [deleted] balay/ftn-command_argument > - [deleted] balay/git-externalpackage-update > - [deleted] balay/improve-odpes > - [deleted] balay/rm-tree > - [deleted] balay/superlu_dist-4.3 > - [deleted] balay/superlu_dist-4.3-p1 > - [deleted] balay/to-maint-add-mpiuni_mpi_in_place > - [deleted] balay/to-maint-add-urlretrieve-timeout > - [deleted] balay/to-maint-fix-fortran-fflag-order > - [deleted] balay/to-maint-fix-gfortran51-warnings > - [deleted] balay/to-maint-fix-win64-long > - [deleted] balay/to-maint-metis-parmetis-nocxx > - [deleted] balay/to-maint-migrate-builds > - [deleted] balay/to-maint/update-superlu_dist-4.1 > - [deleted] balay/update-elemental-0.86-pre > - [deleted] balay/update-gmake-check > - [deleted] balay/update-gnumake-41 > - [deleted] balay/update-metis-xcode-fix-to-maint > - [deleted] balay/update-mpich-3.2 > - [deleted] balay/update-sowing-svn > - [deleted] balay/update-superlu_dist_mar-16-294e2d0 > - [deleted] barry-allow-vecset-nan-3.6 > - [deleted] barry/Sylvain-gmres-symmetric > - [deleted] barry/add-concurrencykit > - [deleted] barry/add-dmdavecgetarrayreadf90/maint > - [deleted] barry/add-dmshellcreaterestriction > - [deleted] barry/add-mpiu_allreduce > - [deleted] barry/add-pcfieldsplit-logevent > - [deleted] barry/add-pcreset-hypre > - [deleted] barry/add-pcreset-hypre-for-master > - [deleted] barry/all-petscoptionssetvalue-beforepetscinitialize > - [deleted] barry/always-mark-floats > - [deleted] barry/better-matsetoption-error > - [deleted] barry/check-for-PetscInt-overflow > - [deleted] barry/check-nullspace-properties > - [deleted] barry/cleanup-pcsetupcalled > - [deleted] barry/cleanup-petscsys > - [deleted] barry/download-mstk > - [deleted] barry/download-pflowtran > - [deleted] barry/downloads > - [deleted] barry/error-on-extern-c-of-petscincludes > - [deleted] barry/feature-force-setting-exactfinaltime > - [deleted] barry/feature-linesearch-monitor > - [deleted] barry/feature-ts-monitor-binary > - [deleted] barry/fix-dmnetworkcomponentalignment > - [deleted] barry/fix-log-summary-format > - [deleted] barry/fix-matgetlocalsubmatrix > - [deleted] barry/fix-matheaderreplace > - [deleted] barry/fix-matseqaijgetarrayf90 > - [deleted] barry/fix-mg-coarse-ksp-defaults > - [deleted] barry/fix-mg-coarse-redundant > - [deleted] barry/
Re: [petsc-dev] git repo branches housekeeping
On Tue, 9 Jun 2015, Satish Balay wrote: > I've deleted all deveopment branches that are already merged into > maint (v3.6) from https://bitbucket.org/petsc/petsc > > However if you wish to remove these branches from your clone - it has > to be done manually (in each clone). > > To get this list of branches to delete - you can do: > > git branch --merged v3.6 |egrep -v " (maint|master|next)" > branches_to_delete > > After *verifying* the list is correct - and ok to delete - they can be > deleted with: > > git branch -d `cat branches_to_delete` > > And to sync the [deleted] remove branch list info - you can do: Ops - meant to say 'sync the [deleted] remote branch list info' Satish > > git fetch > git remote prune origin > > For more housekeeping - look at the remaining local and remote > branches and figure-out what to do. [perhaps some of them are > intermediate branches during rebase - or abandoned features that > should be deleted]. For my branches - I would do: > > git branch > git branch -r |grep balay > > Satish > > reference for self: > $ git branch -r --merged v3.6 |egrep -v origin/\(maint\|master\|next\) > > remote_branches_to_delete > > $ git push -u origin `cat remote_branches_to_delete` > To g...@bitbucket.org:petsc/petsc.git > - [deleted] balay/add-clean > - [deleted] balay/add-f2003-derived-class-ex > - [deleted] balay/atpesc-tutorial-2014 > - [deleted] balay/build-pkgs-without-wall > - [deleted] balay/enable-cygwin-threads > - [deleted] balay/fix-ISConcatenate-memleak > - [deleted] balay/fix-baij-dup-proto > - [deleted] balay/fix-batch-sdot > - [deleted] balay/fix-chaco-blas-test > - [deleted] balay/fix-ctetgen-build > - [deleted] balay/fix-ctetgen-downloadURLSetByUser > - [deleted] balay/fix-glibc-2.20_DEFAULT_SOURCE > - [deleted] balay/fix-missing-proto-test > - [deleted] balay/fix-moab-optionalpkgs > - [deleted] balay/fix-openmpi-sf > - [deleted] balay/fix-scalapack-to-use-f2cblas > - [deleted] balay/fix-suitesparse-32bit-bug > - [deleted] balay/fix-win-f2c-mdd > - [deleted] balay/split-mpi4py-build-log > - [deleted] balay/superlu_dist_4.0 > - [deleted] balay/update-Elemental-0.85 > - [deleted] balay/update-SuiteSparse-4.4.3 > - [deleted] balay/update-configure-lib-search > - [deleted] balay/update-etags > - [deleted] balay/update-git-checks > - [deleted] balay/update-gnumake-check > - [deleted] balay/update-hdf5 > - [deleted] balay/update-hypre-2.10.0b > - [deleted] balay/update-mpich-3.1.3 > - [deleted] balay/update-pastix_5.2.2.20 > - [deleted] balay/update-petsc4py-test > - [deleted] balay/update-scotch_6.0.3-new > - [deleted] barry/add-casts-for-suitsparse-64bitindices > - [deleted] barry/add-ksp-total-iterations/master > - [deleted] barry/add-snes-monitor-ksp > - [deleted] barry/add-some-matsolveforward-back > - [deleted] barry/add-timeout-nag > - [deleted] barry/allow-nonsquare-schurcomplement > - [deleted] barry/allow-null-vecsetvalues > - [deleted] barry/always-include-complex > - [deleted] barry/asmunder/DMDA-fortran-example > - [deleted] barry/change-ilu-default-shift > - [deleted] barry/changes-mpipy-handle-mpifh > - [deleted] barry/check-cuda-compiler-only-when-needed > - [deleted] barry/check-mpi-include > - [deleted] barry/clarify-readVecMatIS-PetscBinaryIO > - [deleted] barry/clean-gamg > - [deleted] barry/cleanup-blaslapack > - [deleted] barry/docs-matblocksize > - [deleted] barry/download-trilinos > - [deleted] barry/dynamic-matsolverpackageregister > - [deleted] barry/error-on-64bitindices-with-ml > - [deleted] barry/error-print-options > - [deleted] barry/erroronbaddmlocaltoglobal_da > - [deleted] barry/experiment > - [deleted] barry/feature-bargraph > - [deleted] barry/feature-configure-allow-environment-vars > - [deleted] barry/feature-hdf5-flexible-initial-dimension > - [deleted] barry/feature-http-in-manualpages > - [deleted] barry/feature-vec-lock > - [deleted] barry/fix-MatLoad_MPIDense_DenseInFile > - [deleted] barry/fix-apple-install > - [deleted] barry/fix-ascii-vtk-output > - [deleted] barry/fix-bjacobi-vector-lengths > - [deleted] barry/fix-complex-petscmath > - [deleted] barry/fix-damp-not-one-pcapplyrichardson > - [deleted] barry/fix-directory-layout > - [deleted] barry/fix-dmda-1d-mirror > - [deleted] barry/fix-dmda-creatematrix-large-nc > - [deleted] barry/fix-dmlocaltoglobal-insert > - [deleted]
