I merged all mine to master. They are done. Matt
On Thu, Aug 29, 2013 at 9:51 PM, Satish Balay <[email protected]> wrote: > On Thu, 29 Aug 2013, Jed Brown wrote: > > > Satish Balay <[email protected]> writes: > > > > >> candidate-branches () { > > >> merged=$1 > > >> dest=$2 > > > > > > what are the arguments here?. Looks a bit complex - so will leave this > to you.. :) > > > > Just paste it into your shell, or put it in .bashrc. > > > > $ candidate-branches master maint > > >>> > It works by checking whether the "merge base" of the branch with > 'master' (before it was merged to 'master') is actually part of 'maint'. > <<<< > > You mean - this is looking for all branches that started off a 'maint' > commit [which is currently in master] - and also its head is merged > into master aswell? > > BTW: I get some errors: > > >>>>>>>> > $ candidate-branches master maint > fatal: Not a valid object name ~1 > usage: git merge-base [-a|--all] <commit> <commit>... > or: git merge-base [-a|--all] --octopus <commit>... > or: git merge-base --independent <commit>... > or: git merge-base --is-ancestor <commit> <commit> > > -a, --all output all common ancestors > --octopus find ancestors for a single n-way merge > --independent list revs not reachable from others > --is-ancestor is the first one ancestor of the other? > > Candidate for maint: refs/remotes/origin/barry/petscdatatypefromstring Fri > Aug 23 21:12:13 2013 -0500 > Candidate for maint: refs/remotes/origin/jed/fix-gamg-coarse Wed May 29 > 22:29:42 2013 -0500 > Candidate for maint: > refs/remotes/origin/jed/fix-viewer-ascii-tab-whitespace Wed Jun 19 09:19:55 > 2013 +0200 > Candidate for maint: refs/remotes/origin/jed/is-view-from-options Sun Aug > 25 01:10:01 2013 -0500 > Candidate for maint: refs/remotes/origin/jed/mat-factor-shift Sat Jun 1 > 12:23:49 2013 -0500 > Candidate for maint: refs/remotes/origin/jed/pcmg-residual-underscore Wed > Jun 26 16:22:39 2013 -0500 > Candidate for maint: refs/remotes/origin/karlrupp/feature-viennacl Mon Jun > 10 16:44:57 2013 -0500 > Candidate for maint: refs/remotes/origin/knepley/fix-configure-package Wed > Jul 17 07:53:11 2013 -0500 > Candidate for maint: refs/remotes/origin/knepley/fix-mat-chop Wed May 29 > 06:46:26 2013 -0500 > Candidate for maint: refs/remotes/origin/knepley/reordering Tue Aug 27 > 22:39:10 2013 -0500 > fatal: Not a valid object name ~1 > usage: git merge-base [-a|--all] <commit> <commit>... > or: git merge-base [-a|--all] --octopus <commit>... > or: git merge-base --independent <commit>... > or: git merge-base --is-ancestor <commit> <commit> > > -a, --all output all common ancestors > --octopus find ancestors for a single n-way merge > --independent list revs not reachable from others > --is-ancestor is the first one ancestor of the other? > > Candidate for maint: refs/remotes/origin/prbrune/pcgamg-classical Thu Jun > 27 12:30:19 2013 -0500 > Candidate for maint: refs/remotes/origin/prbrune/snes-npcjacobianlagging > Tue May 14 09:50:15 2013 -0500 > Candidate for maint: refs/remotes/origin/toby/ksp-dgmres-view Tue Jun 4 > 06:20:21 2013 -0500 > Candidate for maint: refs/remotes/origin/toby/pcfactorgetlevels Fri Jun 7 > 14:20:33 2013 -0500 > Candidate for maint: refs/remotes/origin/toby/pcgamg-rebuild-coarse Wed > Jul 24 16:12:18 2013 -0500 > balay@asterix /home/balay/petsc.clone (master) > <<<<<<<< > > > > > Candidate for maint: refs/remotes/origin/balay/fix-deadlock-on-bgq Wed > Aug 28 11:57:58 2013 -0500 > > Candidate for maint: refs/remotes/origin/balay/fix-scalapack-mpiinc Thu > Jul 4 14:31:22 2013 -0500 > > These two are already merged into maint. Are they listed because you > haven't done a 'git fetch' in a while? Also perhaps its better to use > 'candidate-branches origin/master origin/maint'? > > > > Candidate for maint: refs/remotes/origin/barry/petscdatatypefromstring > Fri Aug 23 21:12:13 2013 -0500 > > Candidate for maint: refs/remotes/origin/jed/fix-gamg-coarse Wed May 29 > 22:29:42 2013 -0500 > > Candidate for maint: > refs/remotes/origin/jed/fix-viewer-ascii-tab-whitespace Wed Jun 19 09:19:55 > 2013 +0200 > > Candidate for maint: refs/remotes/origin/jed/is-view-from-options Sun > Aug 25 01:10:01 2013 -0500 > > Candidate for maint: refs/remotes/origin/jed/mat-factor-shift Sat Jun 1 > 12:23:49 2013 -0500 > > Candidate for maint: refs/remotes/origin/jed/pcmg-residual-underscore > Wed Jun 26 16:22:39 2013 -0500 > > Candidate for maint: refs/remotes/origin/karlrupp/feature-viennacl Mon > Jun 10 16:44:57 2013 -0500 > > Candidate for maint: refs/remotes/origin/knepley/fix-configure-package > Wed Jul 17 07:53:11 2013 -0500 > > Candidate for maint: refs/remotes/origin/knepley/fix-mat-chop Wed May 29 > 06:46:26 2013 -0500 > > Candidate for maint: refs/remotes/origin/knepley/reordering Tue Aug 27 > 22:39:10 2013 -0500 > > Candidate for maint: refs/remotes/origin/prbrune/pcgamg-classical Thu > Jun 27 12:30:19 2013 -0500 > > Candidate for maint: refs/remotes/origin/prbrune/snes-npcjacobianlagging > Tue May 14 09:50:15 2013 -0500 > > Candidate for maint: refs/remotes/origin/toby/ksp-dgmres-view Tue Jun 4 > 06:20:21 2013 -0500 > > Candidate for maint: refs/remotes/origin/toby/pcfactorgetlevels Fri Jun > 7 14:20:33 2013 -0500 > > Candidate for maint: refs/remotes/origin/toby/pcgamg-rebuild-coarse Wed > Jul 24 16:12:18 2013 -0500 > > This is a big list. Perhaps everyone can comment if they should be merged > into maint.. > > [added in a couple more lines to get the list of oustanding commits in > that branch - I see 'karlrupp/feature-viennacl' and a few others are > false positives..] > > <<<<<< > git log --oneline $dest..$branch | cat > echo > <<<<<< > > > $ candidate-branches master maint > fatal: Not a valid object name ~1 > usage: git merge-base [-a|--all] <commit> <commit>... > or: git merge-base [-a|--all] --octopus <commit>... > or: git merge-base --independent <commit>... > or: git merge-base --is-ancestor <commit> <commit> > > -a, --all output all common ancestors > --octopus find ancestors for a single n-way merge > --independent list revs not reachable from others > --is-ancestor is the first one ancestor of the other? > > Candidate for maint: refs/remotes/origin/barry/petscdatatypefromstring Fri > Aug 23 21:12:13 2013 -0500 > 8e4b2d1 Sys: add PetscDataTypeFromString() and test code > > Candidate for maint: refs/remotes/origin/jed/fix-gamg-coarse Wed May 29 > 22:29:42 2013 -0500 > 248bfaf PCBJacobi: call KSPSetFromOptions(subksp) when PCSetUp was called > first > 5b42dca PCGAMG: set bjacobi->same_local_solves=TRUE to clean coarse grid > viewing > > Candidate for maint: > refs/remotes/origin/jed/fix-viewer-ascii-tab-whitespace Wed Jun 19 09:19:55 > 2013 +0200 > 17c4b54 Viewer ASCII: print tabs to petsc_history, not fd > > Candidate for maint: refs/remotes/origin/jed/is-view-from-options Sun Aug > 25 01:10:01 2013 -0500 > 817ea41 AO: fix erroneous processing of -ao_view and factor into > AOViewFromOptions > dba0e79 doc: fix named argument in {Vec,Mat,DM}ViewFromOptions > > Candidate for maint: refs/remotes/origin/jed/mat-factor-shift Sat Jun 1 > 12:23:49 2013 -0500 > 5e9742b Mat PCFactor: include MatFactorShiftType in PCView_Factor output > > Candidate for maint: refs/remotes/origin/jed/pcmg-residual-underscore Wed > Jun 26 16:22:39 2013 -0500 > 21b6e91 PCMGResidualDefault: fix fortran def [error on windows build] > 54b2cd4 PCMGResidualDefault: deprecate old semi-private name and make > public > > Candidate for maint: refs/remotes/origin/karlrupp/feature-viennacl Mon Jun > 10 16:44:57 2013 -0500 > 4cf1874 ViennaCL: Added synchronization to bindings just as for CUSP in > order to allow for correct results with log_summary > 7121bf1 Added custom FORTRAN stubs for MatCreateAIJViennaCL and > MatCreateSeqAIJViennaCL > 023073b Corrected comments in ViennaCL bindings. > 2f39c30 Improved performance of VecMAXPY_SeqViennaCL and > VecAXPBYPCZ_SeqViennaCL for gamma=1. > 65e3cb3 Adjusted parsing of ViennaCL device type options. > 5e5cd3c Adjusted example config file for ViennaCL > 50de6e9 Fixed type warning when passing PetscScalar (*)[2] to > MPI_Allreduce(). > 56f911c Fixed detection of OpenCL on Mac OS. > 824c3e1 Fixed memory leak in VecGetArray()/VecGetArrayRead() for ViennaCL > bindings. > 4f97bae ViennaCL: fix LOCDIR > ab6435e ViennaCL: Updated code for new interface to > PetscObjectComposeFunction() and XXXRegister() > 8ff5867 ViennaCL: Updated to new AMS viewer model > 586241c ViennaCL: Fixed includedir in viennacl.py package handler > 0d73d53 ViennaCL: Applied const-correctness to functions. > 19fddfa ViennaCL: Eliminated whitespace violations, removed/fixed > erroneous comments. > b4986ff ViennaCL: Device type can now be specified via command line. > 4076e18 ViennaCL: Now catching the correct type of exceptions > (std::exception) > 0a9f7e6 ViennaCL: Eliminated dead/unused code > 67c87b7 ViennaCL: Fixed issues if size 0 is passed. > 3db98f8 ViennaCL: Setting VIENNACL_WITH_OPENCL flag to enable OpenCL > backend as default. > dcc04cf ViennaCL: Added package detector for OpenCL, added > OpenCL-dependency for ViennaCL. > 8f86e40 ViennaCL: Added MPI-implementation for AIJ matrices. > 9f10968 ViennaCL: Removed seqviennacl/aijassemble.cxx (would trigger > error, now uses existing fallback) > e4a0ef1 ViennaCL: Renamed files to fulfill conventions (.cpp -> .cxx, all > lowercase), removed restriction of C++ everywhere. > d67ff14 ViennaCL: Added sequential AIJ matrix. > 32d0529 ViennaCL: Added MPI vectors. > ca5856b ViennaCL: Removed unnecessary call to resize() at vector > construction. > 3f559ed ViennaCL: Download of package now working. > b17c682 ViennaCL: First draft, including all operations for sequential > vectors. > > Candidate for maint: refs/remotes/origin/knepley/fix-configure-package Wed > Jul 17 07:53:11 2013 -0500 > 506c33d Configure: Fixed logic when using --with-package-lib when the > package has no includes > > Candidate for maint: refs/remotes/origin/knepley/fix-mat-chop Wed May 29 > 06:46:26 2013 -0500 > 5a4c130 Mat: fix PetscObjectComm call in last commit > e22710e Mat: Remove PETSC_COMM_WORLD from MatChop() > > Candidate for maint: refs/remotes/origin/knepley/reordering Tue Aug 27 > 22:39:10 2013 -0500 > aa932e7 Mat ex170: Comments > 0e8f585 Mat ex170: Test for MatMult() using max instead of plus - Finds > the number of connected components in parallel - Can still optimize better > in parallel > b434eb9 Mat: Added stuff to let me do (max, mult) algebra things for > reordering - Added MatMultMax_SeqAIJ() and MatMultAddMax_SeqAIJ() - Added > PetscSparseDenseMaxDot() > 849b11c Vec: Added VecUniqueEntries() - This is purely diagnostic, but I > think its useful for tests > 745b41b Sys: Added PetscSortRemoveDupsReal() > > fatal: Not a valid object name ~1 > usage: git merge-base [-a|--all] <commit> <commit>... > or: git merge-base [-a|--all] --octopus <commit>... > or: git merge-base --independent <commit>... > or: git merge-base --is-ancestor <commit> <commit> > > -a, --all output all common ancestors > --octopus find ancestors for a single n-way merge > --independent list revs not reachable from others > --is-ancestor is the first one ancestor of the other? > > Candidate for maint: refs/remotes/origin/prbrune/pcgamg-classical Thu Jun > 27 12:30:19 2013 -0500 > 9d2699c PCGAMG Classical: no need to explicitly zero formkktprol > 65b3d5b Fixed types for PCGAMGProlongator_Classical and > PCGAMGGraph_Classical, strict C fix. > 6774142 Complex fixes for classical > 30454c4 Added test examples for classical AMG > e5a0faa Fixed a number of bugs in Classical GAMG > b375234 Fix to the threshold calculation > f82387e Fixed PCGAMG_Classical so that thresholding decreases fill as bugs > are fixed > 3c9ab2c Fixed one-processor memory corruption bug for classical GAMG. > bfde193 Namespacing in gamg/classical.c > 8e6d0c3 Added classical AMG to GAMG > > Candidate for maint: refs/remotes/origin/prbrune/snes-npcjacobianlagging > Tue May 14 09:50:15 2013 -0500 > e514fbc Tests for persistent lagging of the Jacobian or Preconditioner > 9d7e2de Suggested documentation fixes for > SNESSetLagJacobian/PreconditionerPersists() > 971e163 SNESSetCountersReset() lets SNES to keep nfuncs and linear_its for > many solves > 902f982 Control over initial SNES func/norm in one place; inner ASPIN fix. > 25a90ac Fixed the behavior of left-pc SNESes preconditioning right-pc > SNESes. > 37ec4e1 Added SNESGet/SetLagJacobian/PreconditionerPersists() > > Candidate for maint: refs/remotes/origin/toby/ksp-dgmres-view Tue Jun 4 > 06:20:21 2013 -0500 > e788a01 dgmres: doc for -ksp_dgmres_view_deflation_vecs > 9d49465 dgmres: added option to view deflation vecs after solve. > 62aa035 dgmres: fix real typed as int > > Candidate for maint: refs/remotes/origin/toby/pcfactorgetlevels Fri Jun 7 > 14:20:33 2013 -0500 > 2591b31 PCFactor: add PCFactorGetLevels > > Candidate for maint: refs/remotes/origin/toby/pcgamg-rebuild-coarse Wed > Jul 24 16:12:18 2013 -0500 > 0a97e77 PCGAMG: Always rebuild coarse Mat the first time > > > Satish > -- 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
