On Wed, Jan 08, 2014 at 05:06:11PM +0000, Garth N. Wells wrote: > On 2014-01-08 16:17, Anders Logg wrote: > >On Wed, Jan 08, 2014 at 04:10:44PM +0000, Garth N. Wells wrote: > >>On 2014-01-08 15:03, Jed Brown wrote: > >>>"Garth N. Wells" <[email protected]> writes: > >>>>What do we want to do after a release with branches that have been > >>>>merged into master and appeared in a release? Should we be > >>>>deleting old > >>>>branches to keep the number under control? > >>> > >>>Yes, usually delete all branches that have been merged to their final > >>>destination (usually 'master'). This can happen after some grace > >>>period > >>>or after making the release. It's scriptable (just make sure not to > >>>delete integration branches that may also be merged). > >> > > Is > > $ git checkout master > $ git branch -r --merged > > the right and safe way to get a list of branches that have been > merged into master? > > >>Thanks. > >> > >>If anyone has an objection to branches that have been merged into > >>master being deleted, speak up quick. > > > >logg/topic-ccfem is still active, but has had commits since it was > >last merged. > > > > $ git branch -r --merged > > doesn't list logg/topic-ccfem.
As it shouldn't since it has been touched after it was last merged (and should therefore not be removed). Can you double check that it doesn't > list any of your active branches? 'git branch -r --no-merged' does > show up logg/topic-ccfem. Yes, which is correct. This is what I see: origin/chris/ghost-mesh origin/chris/qhull-implicitmesh origin/garth/cgal-experiments origin/garth/clean-up-ufc-object origin/garth/dirichletbc-cell-mark origin/garth/licenses origin/garth/petsc-fieldsplit origin/garth/swig-ignore-mesh-domains origin/garth/use-mpi-communicator origin/garth/vtk-6 origin/johanhake/multistage origin/johanhake/swig-version-check origin/logg/csg origin/logg/topic-ccfem origin/martinal/topic-avoid-ufl-expr-cell origin/mikael/issue-158 origin/mikael/local-average-operator origin/next origin/run-2to3-raise-fix It also shows origin/logg/csg which can be removed. -- Anders _______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
