You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@camel.apache.org by Claus Ibsen <cl...@gmail.com> on 2019/05/31 04:41:45 UTC

Cleaning up branches on git

Hi

I have just deleted a bunch of stale and not used branches from our git.

There are a couple of them left which I wanted to ask about

1) Do we need those release branches anymore? We got a tag of the
release, and also there are the minor version branches, eg
camel-2.23.x etc.

2) There are a few ones which may be deleted
- ci-fix
- graalvm
- java-10-test
- And what is apache-master used for?


The list is as now

origin/CAMEL-13563
  origin/HEAD -> origin/master
  origin/apache-master
  origin/camel-1.x
  origin/camel-2.10.x
  origin/camel-2.11.x
  origin/camel-2.12.x
  origin/camel-2.13.x
  origin/camel-2.14.x
  origin/camel-2.15.x
  origin/camel-2.16.x
  origin/camel-2.17.x
  origin/camel-2.18.x
  origin/camel-2.19.x
  origin/camel-2.20.x
  origin/camel-2.21.x
  origin/camel-2.22.x
  origin/camel-2.23.x
  origin/camel-2.24.x
  origin/camel-2.7.x
  origin/camel-2.8.x
  origin/camel-2.9.x
  origin/camel-2.x
  origin/ci-fix
  origin/graalvm
  origin/java-10-test
  origin/master
  origin/release/2.18.5
  origin/release/2.19.4
  origin/release/2.19.5
  origin/release/2.20.0
  origin/release/2.20.1
  origin/release/2.20.2
  origin/release/2.20.3
  origin/release/2.20.4
  origin/release/2.21.0
  origin/release/2.21.1
  origin/release/2.21.2
  origin/release/2.21.3
  origin/release/2.21.4
  origin/release/2.21.5
  origin/release/2.22.0
  origin/release/2.22.1
  origin/release/2.22.2
  origin/release/2.22.3
  origin/release/2.22.4
  origin/release/2.23.0
  origin/release/2.23.1
  origin/release/2.23.2
  origin/release/2.24.0
  origin/release/3.0.0-M1
  origin/release/3.0.0-M2
  origin/website

-- 
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2

Re: Cleaning up branches on git

Posted by Andrea Cosentino <an...@gmail.com>.
It's just to avoid throwing away the work Zoran already did.

Il giorno ven 31 mag 2019 alle ore 10:54 Claus Ibsen <cl...@gmail.com>
ha scritto:

> On Fri, May 31, 2019 at 9:17 AM Andrea Cosentino <an...@gmail.com>
> wrote:
> >
> > I think there may be interest in having support for JDK11 on 2.x too. But
> > it may be something "best effort".
> >
>
> I really don't think we have the capacity in the Camel team and
> community to support this.
> Our effort should be on the new website, documentation and Camel 3.
>
>
> > Il giorno ven 31 mag 2019 alle ore 09:14 Zoran Regvart <
> zoran@regvart.com>
> > ha scritto:
> >
> > > Hi Claus & Cameleers,
> > > I was working on `java-10-test` to support java 9/10/11+ on the 2.x
> > > branch, I did get pretty far but then I stopped and worked on other
> > > things, so that branch is pretty behind now.
> > >
> > > Does anyone think we need to support Java 9+ on 2.x, and by supporting
> > > I mean testing and making those changes I started around dependency
> > > management not basing the source/target Java versions on anything
> > > other than Java 8.
> > >
> > > If there's little interest in doing that, and since we have support
> > > for Java 11+ in 3.x we can decide to drop that branch,
> > >
> > > zoran
> > >
> > > On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com>
> wrote:
> > > >
> > > > Hi
> > > >
> > > > I have just deleted a bunch of stale and not used branches from our
> git.
> > > >
> > > > There are a couple of them left which I wanted to ask about
> > > >
> > > > 1) Do we need those release branches anymore? We got a tag of the
> > > > release, and also there are the minor version branches, eg
> > > > camel-2.23.x etc.
> > > >
> > > > 2) There are a few ones which may be deleted
> > > > - ci-fix
> > > > - graalvm
> > > > - java-10-test
> > > > - And what is apache-master used for?
> > > >
> > > >
> > > > The list is as now
> > > >
> > > > origin/CAMEL-13563
> > > >   origin/HEAD -> origin/master
> > > >   origin/apache-master
> > > >   origin/camel-1.x
> > > >   origin/camel-2.10.x
> > > >   origin/camel-2.11.x
> > > >   origin/camel-2.12.x
> > > >   origin/camel-2.13.x
> > > >   origin/camel-2.14.x
> > > >   origin/camel-2.15.x
> > > >   origin/camel-2.16.x
> > > >   origin/camel-2.17.x
> > > >   origin/camel-2.18.x
> > > >   origin/camel-2.19.x
> > > >   origin/camel-2.20.x
> > > >   origin/camel-2.21.x
> > > >   origin/camel-2.22.x
> > > >   origin/camel-2.23.x
> > > >   origin/camel-2.24.x
> > > >   origin/camel-2.7.x
> > > >   origin/camel-2.8.x
> > > >   origin/camel-2.9.x
> > > >   origin/camel-2.x
> > > >   origin/ci-fix
> > > >   origin/graalvm
> > > >   origin/java-10-test
> > > >   origin/master
> > > >   origin/release/2.18.5
> > > >   origin/release/2.19.4
> > > >   origin/release/2.19.5
> > > >   origin/release/2.20.0
> > > >   origin/release/2.20.1
> > > >   origin/release/2.20.2
> > > >   origin/release/2.20.3
> > > >   origin/release/2.20.4
> > > >   origin/release/2.21.0
> > > >   origin/release/2.21.1
> > > >   origin/release/2.21.2
> > > >   origin/release/2.21.3
> > > >   origin/release/2.21.4
> > > >   origin/release/2.21.5
> > > >   origin/release/2.22.0
> > > >   origin/release/2.22.1
> > > >   origin/release/2.22.2
> > > >   origin/release/2.22.3
> > > >   origin/release/2.22.4
> > > >   origin/release/2.23.0
> > > >   origin/release/2.23.1
> > > >   origin/release/2.23.2
> > > >   origin/release/2.24.0
> > > >   origin/release/3.0.0-M1
> > > >   origin/release/3.0.0-M2
> > > >   origin/website
> > > >
> > > > --
> > > > Claus Ibsen
> > > > -----------------
> > > > http://davsclaus.com @davsclaus
> > > > Camel in Action 2: https://www.manning.com/ibsen2
> > >
> > >
> > >
> > > --
> > > Zoran Regvart
> > >
>
>
>
> --
> Claus Ibsen
> -----------------
> http://davsclaus.com @davsclaus
> Camel in Action 2: https://www.manning.com/ibsen2
>

Re: Cleaning up branches on git

Posted by Claus Ibsen <cl...@gmail.com>.
On Fri, May 31, 2019 at 9:17 AM Andrea Cosentino <an...@gmail.com> wrote:
>
> I think there may be interest in having support for JDK11 on 2.x too. But
> it may be something "best effort".
>

I really don't think we have the capacity in the Camel team and
community to support this.
Our effort should be on the new website, documentation and Camel 3.


> Il giorno ven 31 mag 2019 alle ore 09:14 Zoran Regvart <zo...@regvart.com>
> ha scritto:
>
> > Hi Claus & Cameleers,
> > I was working on `java-10-test` to support java 9/10/11+ on the 2.x
> > branch, I did get pretty far but then I stopped and worked on other
> > things, so that branch is pretty behind now.
> >
> > Does anyone think we need to support Java 9+ on 2.x, and by supporting
> > I mean testing and making those changes I started around dependency
> > management not basing the source/target Java versions on anything
> > other than Java 8.
> >
> > If there's little interest in doing that, and since we have support
> > for Java 11+ in 3.x we can decide to drop that branch,
> >
> > zoran
> >
> > On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com> wrote:
> > >
> > > Hi
> > >
> > > I have just deleted a bunch of stale and not used branches from our git.
> > >
> > > There are a couple of them left which I wanted to ask about
> > >
> > > 1) Do we need those release branches anymore? We got a tag of the
> > > release, and also there are the minor version branches, eg
> > > camel-2.23.x etc.
> > >
> > > 2) There are a few ones which may be deleted
> > > - ci-fix
> > > - graalvm
> > > - java-10-test
> > > - And what is apache-master used for?
> > >
> > >
> > > The list is as now
> > >
> > > origin/CAMEL-13563
> > >   origin/HEAD -> origin/master
> > >   origin/apache-master
> > >   origin/camel-1.x
> > >   origin/camel-2.10.x
> > >   origin/camel-2.11.x
> > >   origin/camel-2.12.x
> > >   origin/camel-2.13.x
> > >   origin/camel-2.14.x
> > >   origin/camel-2.15.x
> > >   origin/camel-2.16.x
> > >   origin/camel-2.17.x
> > >   origin/camel-2.18.x
> > >   origin/camel-2.19.x
> > >   origin/camel-2.20.x
> > >   origin/camel-2.21.x
> > >   origin/camel-2.22.x
> > >   origin/camel-2.23.x
> > >   origin/camel-2.24.x
> > >   origin/camel-2.7.x
> > >   origin/camel-2.8.x
> > >   origin/camel-2.9.x
> > >   origin/camel-2.x
> > >   origin/ci-fix
> > >   origin/graalvm
> > >   origin/java-10-test
> > >   origin/master
> > >   origin/release/2.18.5
> > >   origin/release/2.19.4
> > >   origin/release/2.19.5
> > >   origin/release/2.20.0
> > >   origin/release/2.20.1
> > >   origin/release/2.20.2
> > >   origin/release/2.20.3
> > >   origin/release/2.20.4
> > >   origin/release/2.21.0
> > >   origin/release/2.21.1
> > >   origin/release/2.21.2
> > >   origin/release/2.21.3
> > >   origin/release/2.21.4
> > >   origin/release/2.21.5
> > >   origin/release/2.22.0
> > >   origin/release/2.22.1
> > >   origin/release/2.22.2
> > >   origin/release/2.22.3
> > >   origin/release/2.22.4
> > >   origin/release/2.23.0
> > >   origin/release/2.23.1
> > >   origin/release/2.23.2
> > >   origin/release/2.24.0
> > >   origin/release/3.0.0-M1
> > >   origin/release/3.0.0-M2
> > >   origin/website
> > >
> > > --
> > > Claus Ibsen
> > > -----------------
> > > http://davsclaus.com @davsclaus
> > > Camel in Action 2: https://www.manning.com/ibsen2
> >
> >
> >
> > --
> > Zoran Regvart
> >



-- 
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2

Re: Cleaning up branches on git

Posted by Andrea Cosentino <an...@gmail.com>.
I think there may be interest in having support for JDK11 on 2.x too. But
it may be something "best effort".

Il giorno ven 31 mag 2019 alle ore 09:14 Zoran Regvart <zo...@regvart.com>
ha scritto:

> Hi Claus & Cameleers,
> I was working on `java-10-test` to support java 9/10/11+ on the 2.x
> branch, I did get pretty far but then I stopped and worked on other
> things, so that branch is pretty behind now.
>
> Does anyone think we need to support Java 9+ on 2.x, and by supporting
> I mean testing and making those changes I started around dependency
> management not basing the source/target Java versions on anything
> other than Java 8.
>
> If there's little interest in doing that, and since we have support
> for Java 11+ in 3.x we can decide to drop that branch,
>
> zoran
>
> On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com> wrote:
> >
> > Hi
> >
> > I have just deleted a bunch of stale and not used branches from our git.
> >
> > There are a couple of them left which I wanted to ask about
> >
> > 1) Do we need those release branches anymore? We got a tag of the
> > release, and also there are the minor version branches, eg
> > camel-2.23.x etc.
> >
> > 2) There are a few ones which may be deleted
> > - ci-fix
> > - graalvm
> > - java-10-test
> > - And what is apache-master used for?
> >
> >
> > The list is as now
> >
> > origin/CAMEL-13563
> >   origin/HEAD -> origin/master
> >   origin/apache-master
> >   origin/camel-1.x
> >   origin/camel-2.10.x
> >   origin/camel-2.11.x
> >   origin/camel-2.12.x
> >   origin/camel-2.13.x
> >   origin/camel-2.14.x
> >   origin/camel-2.15.x
> >   origin/camel-2.16.x
> >   origin/camel-2.17.x
> >   origin/camel-2.18.x
> >   origin/camel-2.19.x
> >   origin/camel-2.20.x
> >   origin/camel-2.21.x
> >   origin/camel-2.22.x
> >   origin/camel-2.23.x
> >   origin/camel-2.24.x
> >   origin/camel-2.7.x
> >   origin/camel-2.8.x
> >   origin/camel-2.9.x
> >   origin/camel-2.x
> >   origin/ci-fix
> >   origin/graalvm
> >   origin/java-10-test
> >   origin/master
> >   origin/release/2.18.5
> >   origin/release/2.19.4
> >   origin/release/2.19.5
> >   origin/release/2.20.0
> >   origin/release/2.20.1
> >   origin/release/2.20.2
> >   origin/release/2.20.3
> >   origin/release/2.20.4
> >   origin/release/2.21.0
> >   origin/release/2.21.1
> >   origin/release/2.21.2
> >   origin/release/2.21.3
> >   origin/release/2.21.4
> >   origin/release/2.21.5
> >   origin/release/2.22.0
> >   origin/release/2.22.1
> >   origin/release/2.22.2
> >   origin/release/2.22.3
> >   origin/release/2.22.4
> >   origin/release/2.23.0
> >   origin/release/2.23.1
> >   origin/release/2.23.2
> >   origin/release/2.24.0
> >   origin/release/3.0.0-M1
> >   origin/release/3.0.0-M2
> >   origin/website
> >
> > --
> > Claus Ibsen
> > -----------------
> > http://davsclaus.com @davsclaus
> > Camel in Action 2: https://www.manning.com/ibsen2
>
>
>
> --
> Zoran Regvart
>

Re: Cleaning up branches on git

Posted by Zoran Regvart <zo...@regvart.com>.
Hi Claus & Cameleers,
I was working on `java-10-test` to support java 9/10/11+ on the 2.x
branch, I did get pretty far but then I stopped and worked on other
things, so that branch is pretty behind now.

Does anyone think we need to support Java 9+ on 2.x, and by supporting
I mean testing and making those changes I started around dependency
management not basing the source/target Java versions on anything
other than Java 8.

If there's little interest in doing that, and since we have support
for Java 11+ in 3.x we can decide to drop that branch,

zoran

On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com> wrote:
>
> Hi
>
> I have just deleted a bunch of stale and not used branches from our git.
>
> There are a couple of them left which I wanted to ask about
>
> 1) Do we need those release branches anymore? We got a tag of the
> release, and also there are the minor version branches, eg
> camel-2.23.x etc.
>
> 2) There are a few ones which may be deleted
> - ci-fix
> - graalvm
> - java-10-test
> - And what is apache-master used for?
>
>
> The list is as now
>
> origin/CAMEL-13563
>   origin/HEAD -> origin/master
>   origin/apache-master
>   origin/camel-1.x
>   origin/camel-2.10.x
>   origin/camel-2.11.x
>   origin/camel-2.12.x
>   origin/camel-2.13.x
>   origin/camel-2.14.x
>   origin/camel-2.15.x
>   origin/camel-2.16.x
>   origin/camel-2.17.x
>   origin/camel-2.18.x
>   origin/camel-2.19.x
>   origin/camel-2.20.x
>   origin/camel-2.21.x
>   origin/camel-2.22.x
>   origin/camel-2.23.x
>   origin/camel-2.24.x
>   origin/camel-2.7.x
>   origin/camel-2.8.x
>   origin/camel-2.9.x
>   origin/camel-2.x
>   origin/ci-fix
>   origin/graalvm
>   origin/java-10-test
>   origin/master
>   origin/release/2.18.5
>   origin/release/2.19.4
>   origin/release/2.19.5
>   origin/release/2.20.0
>   origin/release/2.20.1
>   origin/release/2.20.2
>   origin/release/2.20.3
>   origin/release/2.20.4
>   origin/release/2.21.0
>   origin/release/2.21.1
>   origin/release/2.21.2
>   origin/release/2.21.3
>   origin/release/2.21.4
>   origin/release/2.21.5
>   origin/release/2.22.0
>   origin/release/2.22.1
>   origin/release/2.22.2
>   origin/release/2.22.3
>   origin/release/2.22.4
>   origin/release/2.23.0
>   origin/release/2.23.1
>   origin/release/2.23.2
>   origin/release/2.24.0
>   origin/release/3.0.0-M1
>   origin/release/3.0.0-M2
>   origin/website
>
> --
> Claus Ibsen
> -----------------
> http://davsclaus.com @davsclaus
> Camel in Action 2: https://www.manning.com/ibsen2



-- 
Zoran Regvart

Re: Cleaning up branches on git

Posted by Andrea Cosentino <an...@gmail.com>.
+1

Thanks Gregor

Il giorno lun 17 giu 2019 alle ore 08:54 Gregor Zurowski <
gregor@list.zurowski.org> ha scritto:

> If everyone agrees, I will clean up the existing release branches
> mentioned before.
>
> Thanks,
> Gregor
>
> On Mon, Jun 17, 2019 at 8:48 AM Gregor Zurowski
> <gr...@list.zurowski.org> wrote:
> >
> > Hi Claus,
> >
> > Regarding 1: All release branches can be removed. We can also make it
> > a practice to remove them once a new release is published and merged
> > back into the corresponding parent branch (master or minor release).
> >
> > Thanks,
> > Gregor
> >
> > On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com>
> wrote:
> > >
> > > Hi
> > >
> > > I have just deleted a bunch of stale and not used branches from our
> git.
> > >
> > > There are a couple of them left which I wanted to ask about
> > >
> > > 1) Do we need those release branches anymore? We got a tag of the
> > > release, and also there are the minor version branches, eg
> > > camel-2.23.x etc.
> > >
> > > 2) There are a few ones which may be deleted
> > > - ci-fix
> > > - graalvm
> > > - java-10-test
> > > - And what is apache-master used for?
> > >
> > >
> > > The list is as now
> > >
> > > origin/CAMEL-13563
> > >   origin/HEAD -> origin/master
> > >   origin/apache-master
> > >   origin/camel-1.x
> > >   origin/camel-2.10.x
> > >   origin/camel-2.11.x
> > >   origin/camel-2.12.x
> > >   origin/camel-2.13.x
> > >   origin/camel-2.14.x
> > >   origin/camel-2.15.x
> > >   origin/camel-2.16.x
> > >   origin/camel-2.17.x
> > >   origin/camel-2.18.x
> > >   origin/camel-2.19.x
> > >   origin/camel-2.20.x
> > >   origin/camel-2.21.x
> > >   origin/camel-2.22.x
> > >   origin/camel-2.23.x
> > >   origin/camel-2.24.x
> > >   origin/camel-2.7.x
> > >   origin/camel-2.8.x
> > >   origin/camel-2.9.x
> > >   origin/camel-2.x
> > >   origin/ci-fix
> > >   origin/graalvm
> > >   origin/java-10-test
> > >   origin/master
> > >   origin/release/2.18.5
> > >   origin/release/2.19.4
> > >   origin/release/2.19.5
> > >   origin/release/2.20.0
> > >   origin/release/2.20.1
> > >   origin/release/2.20.2
> > >   origin/release/2.20.3
> > >   origin/release/2.20.4
> > >   origin/release/2.21.0
> > >   origin/release/2.21.1
> > >   origin/release/2.21.2
> > >   origin/release/2.21.3
> > >   origin/release/2.21.4
> > >   origin/release/2.21.5
> > >   origin/release/2.22.0
> > >   origin/release/2.22.1
> > >   origin/release/2.22.2
> > >   origin/release/2.22.3
> > >   origin/release/2.22.4
> > >   origin/release/2.23.0
> > >   origin/release/2.23.1
> > >   origin/release/2.23.2
> > >   origin/release/2.24.0
> > >   origin/release/3.0.0-M1
> > >   origin/release/3.0.0-M2
> > >   origin/website
> > >
> > > --
> > > Claus Ibsen
> > > -----------------
> > > http://davsclaus.com @davsclaus
> > > Camel in Action 2: https://www.manning.com/ibsen2
>

Re: Cleaning up branches on git

Posted by Claus Ibsen <cl...@gmail.com>.
On Mon, Jun 17, 2019 at 8:54 AM Gregor Zurowski
<gr...@list.zurowski.org> wrote:
>
> If everyone agrees, I will clean up the existing release branches
> mentioned before.
>

+1

> Thanks,
> Gregor
>
> On Mon, Jun 17, 2019 at 8:48 AM Gregor Zurowski
> <gr...@list.zurowski.org> wrote:
> >
> > Hi Claus,
> >
> > Regarding 1: All release branches can be removed. We can also make it
> > a practice to remove them once a new release is published and merged
> > back into the corresponding parent branch (master or minor release).
> >
> > Thanks,
> > Gregor
> >
> > On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com> wrote:
> > >
> > > Hi
> > >
> > > I have just deleted a bunch of stale and not used branches from our git.
> > >
> > > There are a couple of them left which I wanted to ask about
> > >
> > > 1) Do we need those release branches anymore? We got a tag of the
> > > release, and also there are the minor version branches, eg
> > > camel-2.23.x etc.
> > >
> > > 2) There are a few ones which may be deleted
> > > - ci-fix
> > > - graalvm
> > > - java-10-test
> > > - And what is apache-master used for?
> > >
> > >
> > > The list is as now
> > >
> > > origin/CAMEL-13563
> > >   origin/HEAD -> origin/master
> > >   origin/apache-master
> > >   origin/camel-1.x
> > >   origin/camel-2.10.x
> > >   origin/camel-2.11.x
> > >   origin/camel-2.12.x
> > >   origin/camel-2.13.x
> > >   origin/camel-2.14.x
> > >   origin/camel-2.15.x
> > >   origin/camel-2.16.x
> > >   origin/camel-2.17.x
> > >   origin/camel-2.18.x
> > >   origin/camel-2.19.x
> > >   origin/camel-2.20.x
> > >   origin/camel-2.21.x
> > >   origin/camel-2.22.x
> > >   origin/camel-2.23.x
> > >   origin/camel-2.24.x
> > >   origin/camel-2.7.x
> > >   origin/camel-2.8.x
> > >   origin/camel-2.9.x
> > >   origin/camel-2.x
> > >   origin/ci-fix
> > >   origin/graalvm
> > >   origin/java-10-test
> > >   origin/master
> > >   origin/release/2.18.5
> > >   origin/release/2.19.4
> > >   origin/release/2.19.5
> > >   origin/release/2.20.0
> > >   origin/release/2.20.1
> > >   origin/release/2.20.2
> > >   origin/release/2.20.3
> > >   origin/release/2.20.4
> > >   origin/release/2.21.0
> > >   origin/release/2.21.1
> > >   origin/release/2.21.2
> > >   origin/release/2.21.3
> > >   origin/release/2.21.4
> > >   origin/release/2.21.5
> > >   origin/release/2.22.0
> > >   origin/release/2.22.1
> > >   origin/release/2.22.2
> > >   origin/release/2.22.3
> > >   origin/release/2.22.4
> > >   origin/release/2.23.0
> > >   origin/release/2.23.1
> > >   origin/release/2.23.2
> > >   origin/release/2.24.0
> > >   origin/release/3.0.0-M1
> > >   origin/release/3.0.0-M2
> > >   origin/website
> > >
> > > --
> > > Claus Ibsen
> > > -----------------
> > > http://davsclaus.com @davsclaus
> > > Camel in Action 2: https://www.manning.com/ibsen2



-- 
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2

Re: Cleaning up branches on git

Posted by Gregor Zurowski <gr...@list.zurowski.org>.
As discussed, I removed all release branches today.

Thanks,
Gregor

On Mon, Jun 17, 2019 at 8:54 AM Gregor Zurowski
<gr...@list.zurowski.org> wrote:
>
> If everyone agrees, I will clean up the existing release branches
> mentioned before.
>
> Thanks,
> Gregor
>
> On Mon, Jun 17, 2019 at 8:48 AM Gregor Zurowski
> <gr...@list.zurowski.org> wrote:
> >
> > Hi Claus,
> >
> > Regarding 1: All release branches can be removed. We can also make it
> > a practice to remove them once a new release is published and merged
> > back into the corresponding parent branch (master or minor release).
> >
> > Thanks,
> > Gregor
> >
> > On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com> wrote:
> > >
> > > Hi
> > >
> > > I have just deleted a bunch of stale and not used branches from our git.
> > >
> > > There are a couple of them left which I wanted to ask about
> > >
> > > 1) Do we need those release branches anymore? We got a tag of the
> > > release, and also there are the minor version branches, eg
> > > camel-2.23.x etc.
> > >
> > > 2) There are a few ones which may be deleted
> > > - ci-fix
> > > - graalvm
> > > - java-10-test
> > > - And what is apache-master used for?
> > >
> > >
> > > The list is as now
> > >
> > > origin/CAMEL-13563
> > >   origin/HEAD -> origin/master
> > >   origin/apache-master
> > >   origin/camel-1.x
> > >   origin/camel-2.10.x
> > >   origin/camel-2.11.x
> > >   origin/camel-2.12.x
> > >   origin/camel-2.13.x
> > >   origin/camel-2.14.x
> > >   origin/camel-2.15.x
> > >   origin/camel-2.16.x
> > >   origin/camel-2.17.x
> > >   origin/camel-2.18.x
> > >   origin/camel-2.19.x
> > >   origin/camel-2.20.x
> > >   origin/camel-2.21.x
> > >   origin/camel-2.22.x
> > >   origin/camel-2.23.x
> > >   origin/camel-2.24.x
> > >   origin/camel-2.7.x
> > >   origin/camel-2.8.x
> > >   origin/camel-2.9.x
> > >   origin/camel-2.x
> > >   origin/ci-fix
> > >   origin/graalvm
> > >   origin/java-10-test
> > >   origin/master
> > >   origin/release/2.18.5
> > >   origin/release/2.19.4
> > >   origin/release/2.19.5
> > >   origin/release/2.20.0
> > >   origin/release/2.20.1
> > >   origin/release/2.20.2
> > >   origin/release/2.20.3
> > >   origin/release/2.20.4
> > >   origin/release/2.21.0
> > >   origin/release/2.21.1
> > >   origin/release/2.21.2
> > >   origin/release/2.21.3
> > >   origin/release/2.21.4
> > >   origin/release/2.21.5
> > >   origin/release/2.22.0
> > >   origin/release/2.22.1
> > >   origin/release/2.22.2
> > >   origin/release/2.22.3
> > >   origin/release/2.22.4
> > >   origin/release/2.23.0
> > >   origin/release/2.23.1
> > >   origin/release/2.23.2
> > >   origin/release/2.24.0
> > >   origin/release/3.0.0-M1
> > >   origin/release/3.0.0-M2
> > >   origin/website
> > >
> > > --
> > > Claus Ibsen
> > > -----------------
> > > http://davsclaus.com @davsclaus
> > > Camel in Action 2: https://www.manning.com/ibsen2

Re: Cleaning up branches on git

Posted by Gregor Zurowski <gr...@list.zurowski.org>.
If everyone agrees, I will clean up the existing release branches
mentioned before.

Thanks,
Gregor

On Mon, Jun 17, 2019 at 8:48 AM Gregor Zurowski
<gr...@list.zurowski.org> wrote:
>
> Hi Claus,
>
> Regarding 1: All release branches can be removed. We can also make it
> a practice to remove them once a new release is published and merged
> back into the corresponding parent branch (master or minor release).
>
> Thanks,
> Gregor
>
> On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com> wrote:
> >
> > Hi
> >
> > I have just deleted a bunch of stale and not used branches from our git.
> >
> > There are a couple of them left which I wanted to ask about
> >
> > 1) Do we need those release branches anymore? We got a tag of the
> > release, and also there are the minor version branches, eg
> > camel-2.23.x etc.
> >
> > 2) There are a few ones which may be deleted
> > - ci-fix
> > - graalvm
> > - java-10-test
> > - And what is apache-master used for?
> >
> >
> > The list is as now
> >
> > origin/CAMEL-13563
> >   origin/HEAD -> origin/master
> >   origin/apache-master
> >   origin/camel-1.x
> >   origin/camel-2.10.x
> >   origin/camel-2.11.x
> >   origin/camel-2.12.x
> >   origin/camel-2.13.x
> >   origin/camel-2.14.x
> >   origin/camel-2.15.x
> >   origin/camel-2.16.x
> >   origin/camel-2.17.x
> >   origin/camel-2.18.x
> >   origin/camel-2.19.x
> >   origin/camel-2.20.x
> >   origin/camel-2.21.x
> >   origin/camel-2.22.x
> >   origin/camel-2.23.x
> >   origin/camel-2.24.x
> >   origin/camel-2.7.x
> >   origin/camel-2.8.x
> >   origin/camel-2.9.x
> >   origin/camel-2.x
> >   origin/ci-fix
> >   origin/graalvm
> >   origin/java-10-test
> >   origin/master
> >   origin/release/2.18.5
> >   origin/release/2.19.4
> >   origin/release/2.19.5
> >   origin/release/2.20.0
> >   origin/release/2.20.1
> >   origin/release/2.20.2
> >   origin/release/2.20.3
> >   origin/release/2.20.4
> >   origin/release/2.21.0
> >   origin/release/2.21.1
> >   origin/release/2.21.2
> >   origin/release/2.21.3
> >   origin/release/2.21.4
> >   origin/release/2.21.5
> >   origin/release/2.22.0
> >   origin/release/2.22.1
> >   origin/release/2.22.2
> >   origin/release/2.22.3
> >   origin/release/2.22.4
> >   origin/release/2.23.0
> >   origin/release/2.23.1
> >   origin/release/2.23.2
> >   origin/release/2.24.0
> >   origin/release/3.0.0-M1
> >   origin/release/3.0.0-M2
> >   origin/website
> >
> > --
> > Claus Ibsen
> > -----------------
> > http://davsclaus.com @davsclaus
> > Camel in Action 2: https://www.manning.com/ibsen2

Re: Cleaning up branches on git

Posted by Zoran Regvart <zo...@regvart.com>.
Hi Gregor,
+1 sound good to me

zoran

On Mon, Jun 17, 2019 at 8:49 AM Gregor Zurowski
<gr...@list.zurowski.org> wrote:
>
> Hi Claus,
>
> Regarding 1: All release branches can be removed. We can also make it
> a practice to remove them once a new release is published and merged
> back into the corresponding parent branch (master or minor release).
>
> Thanks,
> Gregor
>
> On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com> wrote:
> >
> > Hi
> >
> > I have just deleted a bunch of stale and not used branches from our git.
> >
> > There are a couple of them left which I wanted to ask about
> >
> > 1) Do we need those release branches anymore? We got a tag of the
> > release, and also there are the minor version branches, eg
> > camel-2.23.x etc.
> >
> > 2) There are a few ones which may be deleted
> > - ci-fix
> > - graalvm
> > - java-10-test
> > - And what is apache-master used for?
> >
> >
> > The list is as now
> >
> > origin/CAMEL-13563
> >   origin/HEAD -> origin/master
> >   origin/apache-master
> >   origin/camel-1.x
> >   origin/camel-2.10.x
> >   origin/camel-2.11.x
> >   origin/camel-2.12.x
> >   origin/camel-2.13.x
> >   origin/camel-2.14.x
> >   origin/camel-2.15.x
> >   origin/camel-2.16.x
> >   origin/camel-2.17.x
> >   origin/camel-2.18.x
> >   origin/camel-2.19.x
> >   origin/camel-2.20.x
> >   origin/camel-2.21.x
> >   origin/camel-2.22.x
> >   origin/camel-2.23.x
> >   origin/camel-2.24.x
> >   origin/camel-2.7.x
> >   origin/camel-2.8.x
> >   origin/camel-2.9.x
> >   origin/camel-2.x
> >   origin/ci-fix
> >   origin/graalvm
> >   origin/java-10-test
> >   origin/master
> >   origin/release/2.18.5
> >   origin/release/2.19.4
> >   origin/release/2.19.5
> >   origin/release/2.20.0
> >   origin/release/2.20.1
> >   origin/release/2.20.2
> >   origin/release/2.20.3
> >   origin/release/2.20.4
> >   origin/release/2.21.0
> >   origin/release/2.21.1
> >   origin/release/2.21.2
> >   origin/release/2.21.3
> >   origin/release/2.21.4
> >   origin/release/2.21.5
> >   origin/release/2.22.0
> >   origin/release/2.22.1
> >   origin/release/2.22.2
> >   origin/release/2.22.3
> >   origin/release/2.22.4
> >   origin/release/2.23.0
> >   origin/release/2.23.1
> >   origin/release/2.23.2
> >   origin/release/2.24.0
> >   origin/release/3.0.0-M1
> >   origin/release/3.0.0-M2
> >   origin/website
> >
> > --
> > Claus Ibsen
> > -----------------
> > http://davsclaus.com @davsclaus
> > Camel in Action 2: https://www.manning.com/ibsen2



-- 
Zoran Regvart

Re: Cleaning up branches on git

Posted by Gregor Zurowski <gr...@list.zurowski.org>.
Hi Claus,

Regarding 1: All release branches can be removed. We can also make it
a practice to remove them once a new release is published and merged
back into the corresponding parent branch (master or minor release).

Thanks,
Gregor

On Fri, May 31, 2019 at 6:42 AM Claus Ibsen <cl...@gmail.com> wrote:
>
> Hi
>
> I have just deleted a bunch of stale and not used branches from our git.
>
> There are a couple of them left which I wanted to ask about
>
> 1) Do we need those release branches anymore? We got a tag of the
> release, and also there are the minor version branches, eg
> camel-2.23.x etc.
>
> 2) There are a few ones which may be deleted
> - ci-fix
> - graalvm
> - java-10-test
> - And what is apache-master used for?
>
>
> The list is as now
>
> origin/CAMEL-13563
>   origin/HEAD -> origin/master
>   origin/apache-master
>   origin/camel-1.x
>   origin/camel-2.10.x
>   origin/camel-2.11.x
>   origin/camel-2.12.x
>   origin/camel-2.13.x
>   origin/camel-2.14.x
>   origin/camel-2.15.x
>   origin/camel-2.16.x
>   origin/camel-2.17.x
>   origin/camel-2.18.x
>   origin/camel-2.19.x
>   origin/camel-2.20.x
>   origin/camel-2.21.x
>   origin/camel-2.22.x
>   origin/camel-2.23.x
>   origin/camel-2.24.x
>   origin/camel-2.7.x
>   origin/camel-2.8.x
>   origin/camel-2.9.x
>   origin/camel-2.x
>   origin/ci-fix
>   origin/graalvm
>   origin/java-10-test
>   origin/master
>   origin/release/2.18.5
>   origin/release/2.19.4
>   origin/release/2.19.5
>   origin/release/2.20.0
>   origin/release/2.20.1
>   origin/release/2.20.2
>   origin/release/2.20.3
>   origin/release/2.20.4
>   origin/release/2.21.0
>   origin/release/2.21.1
>   origin/release/2.21.2
>   origin/release/2.21.3
>   origin/release/2.21.4
>   origin/release/2.21.5
>   origin/release/2.22.0
>   origin/release/2.22.1
>   origin/release/2.22.2
>   origin/release/2.22.3
>   origin/release/2.22.4
>   origin/release/2.23.0
>   origin/release/2.23.1
>   origin/release/2.23.2
>   origin/release/2.24.0
>   origin/release/3.0.0-M1
>   origin/release/3.0.0-M2
>   origin/website
>
> --
> Claus Ibsen
> -----------------
> http://davsclaus.com @davsclaus
> Camel in Action 2: https://www.manning.com/ibsen2