maria-developers team mailing list archive

[Sergey Vojtovich <svoj@xxxxxxxxxxx>]

Hi Kristian,

Thanks for raising this issue. Amount of branches is painful indeed. A few
comments from my side.

First, your list seem to be quite outdated. Did you run git remote prune origin?
At the moment of writing https://github.com/MariaDB/server says there're 124
branches.

At least the following branches don't seem to exist anymore:
> origin/bb-10.1-systemd                    1 year                ago  Sergey Vojtovich <svoj@xxxxxxxxxxx>
> origin/bb-svoj                            1 year, 1 month       ago  Sergey Vojtovich <svoj@xxxxxxxxxxx>
> origin/bb-10.1-atomics                    1 year, 10 months     ago  Sergei Golubchik <serg@xxxxxxxxxxx>
> origin/bb-lf-no-oom                       1 year, 10 months     ago  Sergei Golubchik <serg@xxxxxxxxxxx>
> origin/bb-lf-iterator                     1 year, 11 months     ago  Sergey Vojtovich <svoj@xxxxxxxxxxx>
> origin/bb-no-ndb                          2 years, 3 months     ago  Sergei Golubchik <serg@xxxxxxxxxxx>
> origin/bb-10.2-mdev10813                MDEV-10813      Closed
> origin/bb-10.2-mdev5492                 MDEV-5492       Closed
> origin/bb-10.2-MDEV-6720                MDEV-6720       Closed
> origin/bb-10.2-mdev9857                 MDEV-9857       Closed
> origin/bb-10.2-mdev7660                 MDEV-7660       Closed
> origin/bb-mdev6089                      MDEV-6089       Closed
> origin/bb-mdev7715                      MDEV-7715       Closed
> origin/bb-mdev7728                      MDEV-7728       Closed
> origin/bb-mdev7793                      MDEV-7793       Closed
> origin/bb-mdev7894                      MDEV-7894       Closed
> origin/bb-mdev7895                      MDEV-7895       Closed
> origin/bb-mdev7922                      MDEV-7922       Closed
> origin/mdev-8380                        MDEV-8380       Closed       
> origin/svoj-gittest           1 year, 6 months  ago  Sergey Vojtovich <svoj@xxxxxxxxxxx>

Second, I strongly suggest not to remove anything without branch owner approval.
Potential data loss overweights clean-up benefits.

At least the following branches may have valuable revisions:
> origin/10.1-spider                        1 year, 1 month       ago  Michael Widenius <monty@xxxxxxxxxxx>
> origin/10.0-power                         1 year, 7 months      ago  Sergey Vojtovich <svoj@xxxxxxxxxxx>


On Mon, Nov 07, 2016 at 01:26:07PM +0100, Kristian Nielsen wrote:
> We currently have more than 200 branches in the MariaDB Server github repo,
> most of which look like they are no longer used. I would like to remove the
> unused ones to remove clutter. Eg. in `git branch -la` or the drop-downs on
> the github webpage.
> 
> Below is a list of a little less than two-thirds of the branches that I
> determined to be probably unused. I was fairly conservative in my criteria,
> ie. if there was reasonable doubt, I omitted a branch from the list to
> delete.
> 
> Please take a look at the list and see if there is any branch that should
> _not_ be deleted from the github repository. Or if someone objects to
> deleting anything on principle grounds, let me know as well, of course.
> 
> (I Cc'ed people that were the last to commit on a branch to be deleted).
> 
> Note that if one of these branches should become needed again later,
> eg. some bb-XXX branch not used for a long time, there is no problem
> re-creating it. The only problem with removing a branch should be if it
> contains contents that will be needed in the future, and which is not
> available anywhere else (and I tried to avoid putting such branches on the
> list in the first place).
> 
> Also note that once these are deleted, a simple `git pull` will not remove
> them from the local clone. The `git fetch --prune` can be used to effect
> this.
> 
> If there are no objections, I will do the deletions in two weeks.
> 
>  - Kristian.
...skip...

Regards,
Sergey