[petsc-dev] v3.5 release schedule
Jed Brown
jedbrown at mcs.anl.gov
Sun Oct 6 18:05:06 CDT 2013
Barry Smith <bsmith at mcs.anl.gov> writes:
> What does *completely* merged here in this context? Would a branch
> that was merged, but then modified and that modified version not
> merged be "incompletely" merged?
Exactly.
> How do we make sure those modifications get into master if the
> person who "owns" the branch is not aware that the modification
> hasn't gotten into master (or next).
Those branches show up here:
$ git branch -r --no-merged next
origin/balay/remove-sdir
origin/barry/august-tutorial
origin/barry/feature-ams
origin/barry/fix-get-create
origin/barry/fix-mat-checkinode-factorlu
origin/barry/html
origin/barry/saws
origin/barry/superlu_mt
origin/barry/tikz
origin/barry/twitter
origin/barry/wirth-fusion-materials
origin/barry/xcode
origin/hzhang/fix-ptaptest
origin/hzhang/ksp-minresqlp
origin/hzhang/snes-jacobiancoloropt
origin/jed/august-tutorial
origin/jed/cray-externc
origin/jed/ksp-plugin
origin/jed/mat-eigenvalue-cache
origin/jed/missing-prototype
origin/jed/ts-heat-plex
origin/karlrupp/doc-doxygen
origin/karpeev/fix-pc-fieldsplit-reset
origin/klaij/fieldsplit-simple-ex70
origin/knepley/dmswarm
origin/knepley/feature-dmda-section
origin/knepley/feature-plex-refine-3d
origin/knepley/fix-mem-init
origin/knepley/pylith
origin/knepley/solkx
origin/knepley/swarm
origin/madams/gamg-parmtests
origin/madams/gamg-tests
origin/madams/gamg-tests-rebased
origin/madams/gamg-tests2
origin/madams/sor-residual
origin/maint
origin/master
origin/paulmullowney/cusp-sequential-vector-scatter
origin/prbrune/mat-matcolor
origin/prbrune/pcgamg-bootstrap
origin/prbrune/snes-fasadditive
origin/prbrune/snes-fasfull
origin/psanan/ts-bz-examples
origin/psanan/ts-multiscale
origin/psanan/ts-rhs-partitions
origin/psanan/ts-tests
origin/sarich/rnet-all
origin/sarich/rnet-fix-rebase
origin/sarich/rnet-import
origin/shri/FTRTDS-project
origin/shri/feature-dm-circuit
origin/shri/projects-dmcircuit
origin/stefano_zampini/pcbddc-baijfixes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20131006/26afd4cb/attachment.sig>
More information about the petsc-dev
mailing list