Here's a compiled list of all branches whose future is yet to be decided: https://docs.google.com/spreadsheets/d/1Wg0gqbiXdwyb4lt_52UK4C9qnN6yj20vWRlbzlgpJgY/edit?usp=sharing
I didn't have time yet to dig deeper into each one to recommend and action though. I've a backup of all the branches before starting this so no worries. On Tue, 19 Nov 2019 at 11:05, Gabriel Roldan <gabriel.rol...@gmail.com> wrote: > Thanks Nuno for the command. > > I'm gonna start by deleting the following ones that are safe to remove: > > Already merged to (reachable from) master: > git for-each-ref --sort=committerdate > --format="%(committerdate:short),%(objectname:short),%(refname:short),\"%(authorname)\"" > refs/remotes/upstream --merged=master > Date Commit Name Author Action > 2014-01-15 633fa54f0d upstream/master-recover Andrea Aime delete > 2018-10-26 6708a2449d upstream/jdk11_restructure Jody Garnett delete > 2018-11-17 5de88f9940 upstream/sld10-hint Andrea Aime delete > 2019-10-15 9235bc9505 upstream/revert-3826-disable_concurrent_get_tests Andrea > Aime delete > 2019-11-16 9ffa145bcc upstream/revert-3860-perf/filesystemwatcher Andrea > Aime delete > > Already merged to (reachable from) 2.16.x (covers all reachable from > 2.15.x too): > git for-each-ref --sort=committerdate > --format="%(committerdate:short),%(objectname:short),%(refname:short),\"%(authorname)\"" > refs/remotes/upstream --merged=2.16.x > Date Commit Name Author Action > 2019-08-16 a1ec1ddc1d upstream/backport-3712-to-2.16.x AndyFlem delete > 2019-08-28 0f564cd352 upstream/backport-3722-to-2.16.x Fernando Mino > delete > 2019-09-27 a36cf2458a upstream/backport-3792-to-2.16.x Imran delete > 2019-10-04 ac3644b8f8 upstream/backport-3808-to-2.16.x Dmitri Sirobokov > delete > 2019-10-11 b0c91c09a0 upstream/backport-3820-to-2.16.x unknown delete > 2019-10-18 21a369026f upstream/backport-3837-to-2.16.x njankovic delete > 2019-10-19 d3034f0d78 upstream/backport-3797-to-2.16.x Andrea Aime delete > 2019-10-20 7710e2069c upstream/backport-3844-to-2.16.x Andrea Aime delete > 2019-11-16 534d66b67a upstream/revert-3896-backport-3860-to-2.16.x Andrea > Aime delete > > Already merged to (reachable from) 2.1.x to 2.14.x > for i in `seq 1 14`; do git for-each-ref --sort=committerdate > --format="%(committerdate:short),%(objectname:short),%(refname:short),\"%(authorname)\"" > refs/remotes/upstream --merged=upstream/2.$i.x >> > branches/merged_to_2.1.x_to_2.14.x.csv ;done > Date Commit Name Author Action > 2013-06-24 dc09fb111a upstream/22x-recover Andrea Aime delete > 2014-01-13 f74b11f5e4 upstream/24x-recover Andrea Aime delete > 2014-01-13 fbc784acad upstream/23x-recover Tom Kunicki delete > 2014-01-15 633fa54f0d upstream/master-recover Andrea Aime delete > 2015-07-22 b385fb4fbd upstream/simboss-patch-3 Simone Giannecchini delete > 2015-08-28 c109f82313 upstream/simboss-patch-4 Simone Giannecchini delete > 2015-09-23 9a5f724671 upstream/27_GEOS-7207 afabiani delete > 2015-09-23 b27e40eee3 upstream/28_GEOS-7207 afabiani delete > 2016-02-06 1e9a417f20 > upstream/removing-params-extract-from-2.8.x-community Simone Giannecchini > delete > 2016-02-06 51e7d8caf9 upstream/removing-params-extractor-from-2.7-nightly > Simone > Giannecchini delete > 2016-02-06 fdcfc58233 upstream/fix-nightly-2.7.x Simone Giannecchini > delete > 2019-07-15 0d218d671d upstream/backport-3660-to-2.14.x Imran delete > 2019-08-28 ab0ed73996 upstream/backport-3722-to-2.14.x Fernando Mino > delete > > On Mon, 18 Nov 2019 at 22:25, Torben Barsballe <torbenbarsba...@gmail.com> > wrote: > >> Hello All, >> >> I haven't had experience with automatic branch deletion either, but seems >> like a good idea to me. +1. >> >> It looks like a good chunk of the extra branches seem to be from various >> large collaborative efforts (e.g. java 11 refactor, ysld). Given that a >> bunch of those involved some degree of refactoring before being merged, >> it's likely they won't show up as dangling branches >> >> Most of the rest seem to be old PR branches from before "PR's should be >> on forks" was included in the contributing guide or enforced. >> >> All that said, I've deleted my four dangling branches - thanks for that >> search command Nuno. >> >> Wed May 10 12:03:02 2017 -0700 Torben Barsballe >> refs/remotes/upstream/GEOS-8117-cite >> >> Thu Oct 25 16:16:27 2018 -0700 Torben Barsballe >> refs/remotes/upstream/jdk11 >> >> Mon Oct 29 09:30:58 2018 -0700 Torben Barsballe >> refs/remotes/upstream/jdk11_main_split >> >> Thu Oct 25 12:36:04 2018 -0700 Torben Barsballe >> refs/remotes/upstream/spring-5.1 >> >> >> Cheers, >> >> Torben >> >> On Sun, Nov 17, 2019 at 3:31 AM Nuno Oliveira GeoSolutions < >> nuno.olive...@geo-solutions.it> wrote: >> >>> Hi Gabriel, Andrea, >>> no experience with that automation, but I would say +1. >>> >>> Just cleaned my dangling branch: >>> >>> >$ git for-each-ref --sort=authorname --format="%(committerdate) %09 >>> %(authorname) %09 %(refname)" refs/remotes/upstream | grep "Nuno Oliveira" >>> Thu Oct 3 22:57:07 2019 +0200 Nuno Oliveira >>> refs/remotes/upstream/revert-3778-GEOS-9340 >>> >>> >$ git push upstream --delete revert-3778-GEOS-9340 >>> To https://github.com/geoserver/geoserver >>> - [deleted] revert-3778-GEOS-9340 >>> >>> Best regards, >>> Nuno Oliveira >>> >>> On Sat, Nov 16, 2019 at 6:51 PM Andrea Aime < >>> andrea.a...@geo-solutions.it> wrote: >>> >>>> On Sat, Nov 16, 2019 at 7:48 PM Andrea Aime < >>>> andrea.a...@geo-solutions.it> wrote: >>>> >>>>> We should start by making sure once a PR is merged, it's branch gets >>>>>> deleted. Especially the ones created by the backports hook, cause almost >>>>>> all other ones should come from branches on people's forks so each one >>>>>> can >>>>>> do whatever they want with those. >>>>>> >>>>> >>>> Just stumbled into this automation, has anyone experiences with it? >>>> >>>> https://help.github.com/en/github/administering-a-repository/managing-the-automatic-deletion-of-branches >>>> >>>> Cheers >>>> Andrea >>>> >>>> == >>>> >>>> GeoServer Professional Services from the experts! Visit >>>> http://goo.gl/it488V for more information. == Ing. Andrea Aime >>>> @geowolf Technical Lead GeoSolutions S.A.S. Via di Montramito 3/A 55054 >>>> Massarosa (LU) phone: +39 0584 962313 fax: +39 0584 1660272 mob: +39 339 >>>> 8844549 http://www.geo-solutions.it http://twitter.com/geosolutions_it >>>> ------------------------------------------------------- *Con >>>> riferimento alla normativa sul trattamento dei dati personali (Reg. UE >>>> 2016/679 - Regolamento generale sulla protezione dei dati “GDPR”), si >>>> precisa che ogni circostanza inerente alla presente email (il suo >>>> contenuto, gli eventuali allegati, etc.) è un dato la cui conoscenza è >>>> riservata al/i solo/i destinatario/i indicati dallo scrivente. Se il >>>> messaggio Le è giunto per errore, è tenuta/o a cancellarlo, ogni altra >>>> operazione è illecita. Le sarei comunque grato se potesse darmene notizia. >>>> This email is intended only for the person or entity to which it is >>>> addressed and may contain information that is privileged, confidential or >>>> otherwise protected from disclosure. We remind that - as provided by >>>> European Regulation 2016/679 “GDPR” - copying, dissemination or use of this >>>> e-mail or the information herein by anyone other than the intended >>>> recipient is prohibited. If you have received this email by mistake, please >>>> notify us immediately by telephone or e-mail.* >>>> _______________________________________________ >>>> Geoserver-devel mailing list >>>> Geoserver-devel@lists.sourceforge.net >>>> https://lists.sourceforge.net/lists/listinfo/geoserver-devel >>>> >>> >>> >>> -- >>> Regards, >>> Nuno Oliveira >>> == >>> GeoServer Professional Services from the experts! >>> Visit http://goo.gl/it488V for more information. >>> == >>> >>> Nuno Miguel Carvalho Oliveira >>> @nmcoliveira >>> Software Engineer >>> >>> GeoSolutions S.A.S. >>> Via di Montramito 3/A >>> 55054 Massarosa (LU) >>> Italy >>> phone: +39 0584 962313 >>> fax: +39 0584 1660272 >>> >>> http://www.geo-solutions.it >>> http://twitter.com/geosolutions_it >>> >>> ------------------------------------------------------- >>> >>> Con riferimento alla normativa sul trattamento dei dati >>> personali (Reg. UE 2016/679 - Regolamento generale sulla >>> protezione dei dati “GDPR”), si precisa che ogni >>> circostanza inerente alla presente email (il suo contenuto, >>> gli eventuali allegati, etc.) è un dato la cui conoscenza >>> è riservata al/i solo/i destinatario/i indicati dallo >>> scrivente. Se il messaggio Le è giunto per errore, è >>> tenuta/o a cancellarlo, ogni altra operazione è illecita. >>> Le sarei comunque grato se potesse darmene notizia. >>> >>> This email is intended only for the person or entity to >>> which it is addressed and may contain information that >>> is privileged, confidential or otherwise protected from >>> disclosure. We remind that - as provided by European >>> Regulation 2016/679 “GDPR” - copying, dissemination or >>> use of this e-mail or the information herein by anyone >>> other than the intended recipient is prohibited. If you >>> have received this email by mistake, please notify >>> us immediately by telephone or e-mail. >>> _______________________________________________ >>> Geoserver-devel mailing list >>> Geoserver-devel@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/geoserver-devel >>> >> _______________________________________________ >> Geoserver-devel mailing list >> Geoserver-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/geoserver-devel >> > > > -- > Gabriel Roldán > -- Gabriel Roldán
_______________________________________________ Geoserver-devel mailing list Geoserver-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/geoserver-devel
