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 2016/03/31 12:14:20 UTC
Cleanup remote branches
We got a bunch of remote branches that has been merged to master, or
is no longer in use.
I propose to remove all branches that are not camel release branches
or master itself. And the old trunk branch (should it be kept?)
These are the ones:
origin/CAMEL-4232
origin/CAMEL-6555
origin/camel-atmos
origin/camel-gora
origin/camel-ignite
origin/cxf3
origin/cxf_wrong_content_length
origin/feature/camel-hystrix
origin/feature/camel-xmljson-legal-license-compliance
origin/fix-8478
origin/fix/CAMEL-8689-camel-dozer-classloading-issue
origin/jdk8-lambdas
origin/jsonpath_encoding
origin/osgi-trouble
origin/temp-jetty9
origin/temp-jetty9-2
And what is this branch used for?
origin/master-dev
--
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2
Re: Cleanup remote branches
Posted by Matt Sicker <bo...@gmail.com>.
Anyone who is actually using a remote branch will have a local copy
anyways. Stranded branches probably aren't being worked on anymore, either.
On 4 April 2016 at 07:09, Grzegorz Grzybek <gr...@gmail.com> wrote:
> No problem from me either.
>
> regards
> Grzegorz
>
> 2016-04-04 13:58 GMT+02:00 Andrea Cosentino <ancosen1985@yahoo.com.invalid
> >:
>
> > No problem from my side.
> >
> > In my opinion we can remove them.
> >
> > Thanks!
> > --
> > Andrea Cosentino
> > ----------------------------------
> > Apache Camel PMC Member
> > Apache Karaf Committer
> > Apache Servicemix Committer
> > Email: ancosen1985@yahoo.com
> > Twitter: @oscerd2
> > Github: oscerd
> >
> >
> >
> > On Monday, April 4, 2016 1:57 PM, Claus Ibsen <cl...@gmail.com>
> > wrote:
> > Hi
> >
> > Could any Camel committer take a look at that list.
> >
> > If nothing is heard by next week we will start delete them.
> >
> > On Sun, Apr 3, 2016 at 9:35 PM, Gregor Zurowski
> > <gr...@list.zurowski.org> wrote:
> > > +1
> > >
> > > It would be nice to remove these branches, including trunk and
> > master-dev.
> > >
> > > Thanks,
> > > Gregor
> > >
> > >
> > > On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com>
> > wrote:
> > >> We got a bunch of remote branches that has been merged to master, or
> > >> is no longer in use.
> > >>
> > >> I propose to remove all branches that are not camel release branches
> > >> or master itself. And the old trunk branch (should it be kept?)
> > >>
> > >> These are the ones:
> > >>
> > >> origin/CAMEL-4232
> > >> origin/CAMEL-6555
> > >> origin/camel-atmos
> > >> origin/camel-gora
> > >> origin/camel-ignite
> > >> origin/cxf3
> > >> origin/cxf_wrong_content_length
> > >> origin/feature/camel-hystrix
> > >> origin/feature/camel-xmljson-legal-license-compliance
> > >> origin/fix-8478
> > >> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
> > >> origin/jdk8-lambdas
> > >> origin/jsonpath_encoding
> > >> origin/osgi-trouble
> > >> origin/temp-jetty9
> > >> origin/temp-jetty9-2
> > >>
> > >>
> > >> And what is this branch used for?
> > >>
> > >> origin/master-dev
> > >>
> > >>
> > >> --
> > >> 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
> >
>
--
Matt Sicker <bo...@gmail.com>
Re: Cleanup remote branches
Posted by Grzegorz Grzybek <gr...@gmail.com>.
No problem from me either.
regards
Grzegorz
2016-04-04 13:58 GMT+02:00 Andrea Cosentino <an...@yahoo.com.invalid>:
> No problem from my side.
>
> In my opinion we can remove them.
>
> Thanks!
> --
> Andrea Cosentino
> ----------------------------------
> Apache Camel PMC Member
> Apache Karaf Committer
> Apache Servicemix Committer
> Email: ancosen1985@yahoo.com
> Twitter: @oscerd2
> Github: oscerd
>
>
>
> On Monday, April 4, 2016 1:57 PM, Claus Ibsen <cl...@gmail.com>
> wrote:
> Hi
>
> Could any Camel committer take a look at that list.
>
> If nothing is heard by next week we will start delete them.
>
> On Sun, Apr 3, 2016 at 9:35 PM, Gregor Zurowski
> <gr...@list.zurowski.org> wrote:
> > +1
> >
> > It would be nice to remove these branches, including trunk and
> master-dev.
> >
> > Thanks,
> > Gregor
> >
> >
> > On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com>
> wrote:
> >> We got a bunch of remote branches that has been merged to master, or
> >> is no longer in use.
> >>
> >> I propose to remove all branches that are not camel release branches
> >> or master itself. And the old trunk branch (should it be kept?)
> >>
> >> These are the ones:
> >>
> >> origin/CAMEL-4232
> >> origin/CAMEL-6555
> >> origin/camel-atmos
> >> origin/camel-gora
> >> origin/camel-ignite
> >> origin/cxf3
> >> origin/cxf_wrong_content_length
> >> origin/feature/camel-hystrix
> >> origin/feature/camel-xmljson-legal-license-compliance
> >> origin/fix-8478
> >> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
> >> origin/jdk8-lambdas
> >> origin/jsonpath_encoding
> >> origin/osgi-trouble
> >> origin/temp-jetty9
> >> origin/temp-jetty9-2
> >>
> >>
> >> And what is this branch used for?
> >>
> >> origin/master-dev
> >>
> >>
> >> --
> >> 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: Cleanup remote branches
Posted by Andrea Cosentino <an...@yahoo.com.INVALID>.
No problem from my side.
In my opinion we can remove them.
Thanks!
--
Andrea Cosentino
----------------------------------
Apache Camel PMC Member
Apache Karaf Committer
Apache Servicemix Committer
Email: ancosen1985@yahoo.com
Twitter: @oscerd2
Github: oscerd
On Monday, April 4, 2016 1:57 PM, Claus Ibsen <cl...@gmail.com> wrote:
Hi
Could any Camel committer take a look at that list.
If nothing is heard by next week we will start delete them.
On Sun, Apr 3, 2016 at 9:35 PM, Gregor Zurowski
<gr...@list.zurowski.org> wrote:
> +1
>
> It would be nice to remove these branches, including trunk and master-dev.
>
> Thanks,
> Gregor
>
>
> On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com> wrote:
>> We got a bunch of remote branches that has been merged to master, or
>> is no longer in use.
>>
>> I propose to remove all branches that are not camel release branches
>> or master itself. And the old trunk branch (should it be kept?)
>>
>> These are the ones:
>>
>> origin/CAMEL-4232
>> origin/CAMEL-6555
>> origin/camel-atmos
>> origin/camel-gora
>> origin/camel-ignite
>> origin/cxf3
>> origin/cxf_wrong_content_length
>> origin/feature/camel-hystrix
>> origin/feature/camel-xmljson-legal-license-compliance
>> origin/fix-8478
>> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
>> origin/jdk8-lambdas
>> origin/jsonpath_encoding
>> origin/osgi-trouble
>> origin/temp-jetty9
>> origin/temp-jetty9-2
>>
>>
>> And what is this branch used for?
>>
>> origin/master-dev
>>
>>
>> --
>> 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: Cleanup remote branches
Posted by Christian Müller <ch...@gmail.com>.
+1
Best,
Christian
Am 04.04.2016 13:57 schrieb "Claus Ibsen" <cl...@gmail.com>:
> Hi
>
> Could any Camel committer take a look at that list.
>
> If nothing is heard by next week we will start delete them.
>
> On Sun, Apr 3, 2016 at 9:35 PM, Gregor Zurowski
> <gr...@list.zurowski.org> wrote:
> > +1
> >
> > It would be nice to remove these branches, including trunk and
> master-dev.
> >
> > Thanks,
> > Gregor
> >
> >
> > On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com>
> wrote:
> >> We got a bunch of remote branches that has been merged to master, or
> >> is no longer in use.
> >>
> >> I propose to remove all branches that are not camel release branches
> >> or master itself. And the old trunk branch (should it be kept?)
> >>
> >> These are the ones:
> >>
> >> origin/CAMEL-4232
> >> origin/CAMEL-6555
> >> origin/camel-atmos
> >> origin/camel-gora
> >> origin/camel-ignite
> >> origin/cxf3
> >> origin/cxf_wrong_content_length
> >> origin/feature/camel-hystrix
> >> origin/feature/camel-xmljson-legal-license-compliance
> >> origin/fix-8478
> >> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
> >> origin/jdk8-lambdas
> >> origin/jsonpath_encoding
> >> origin/osgi-trouble
> >> origin/temp-jetty9
> >> origin/temp-jetty9-2
> >>
> >>
> >> And what is this branch used for?
> >>
> >> origin/master-dev
> >>
> >>
> >> --
> >> 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: Cleanup remote branches
Posted by Claus Ibsen <cl...@gmail.com>.
Hi
Could any Camel committer take a look at that list.
If nothing is heard by next week we will start delete them.
On Sun, Apr 3, 2016 at 9:35 PM, Gregor Zurowski
<gr...@list.zurowski.org> wrote:
> +1
>
> It would be nice to remove these branches, including trunk and master-dev.
>
> Thanks,
> Gregor
>
>
> On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com> wrote:
>> We got a bunch of remote branches that has been merged to master, or
>> is no longer in use.
>>
>> I propose to remove all branches that are not camel release branches
>> or master itself. And the old trunk branch (should it be kept?)
>>
>> These are the ones:
>>
>> origin/CAMEL-4232
>> origin/CAMEL-6555
>> origin/camel-atmos
>> origin/camel-gora
>> origin/camel-ignite
>> origin/cxf3
>> origin/cxf_wrong_content_length
>> origin/feature/camel-hystrix
>> origin/feature/camel-xmljson-legal-license-compliance
>> origin/fix-8478
>> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
>> origin/jdk8-lambdas
>> origin/jsonpath_encoding
>> origin/osgi-trouble
>> origin/temp-jetty9
>> origin/temp-jetty9-2
>>
>>
>> And what is this branch used for?
>>
>> origin/master-dev
>>
>>
>> --
>> 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: Cleanup remote branches
Posted by Gregor Zurowski <gr...@list.zurowski.org>.
+1
It would be nice to remove these branches, including trunk and master-dev.
Thanks,
Gregor
On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com> wrote:
> We got a bunch of remote branches that has been merged to master, or
> is no longer in use.
>
> I propose to remove all branches that are not camel release branches
> or master itself. And the old trunk branch (should it be kept?)
>
> These are the ones:
>
> origin/CAMEL-4232
> origin/CAMEL-6555
> origin/camel-atmos
> origin/camel-gora
> origin/camel-ignite
> origin/cxf3
> origin/cxf_wrong_content_length
> origin/feature/camel-hystrix
> origin/feature/camel-xmljson-legal-license-compliance
> origin/fix-8478
> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
> origin/jdk8-lambdas
> origin/jsonpath_encoding
> origin/osgi-trouble
> origin/temp-jetty9
> origin/temp-jetty9-2
>
>
> And what is this branch used for?
>
> origin/master-dev
>
>
> --
> Claus Ibsen
> -----------------
> http://davsclaus.com @davsclaus
> Camel in Action 2: https://www.manning.com/ibsen2
Re: Cleanup remote branches
Posted by Andrea Cosentino <an...@yahoo.com.INVALID>.
Ok for me.
--
Andrea Cosentino
----------------------------------
Apache Camel PMC Member
Apache Karaf Committer
Apache Servicemix Committer
Email: ancosen1985@yahoo.com
Twitter: @oscerd2
Github: oscerd
On Tuesday, April 12, 2016 12:59 PM, Claus Ibsen <cl...@gmail.com> wrote:
Hi
I have deleted some branches and we have now
origin/2.11.x
origin/HEAD -> origin/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.7.x
origin/camel-2.8.x
origin/camel-2.9.x
origin/master
origin/master-dev
origin/trunk
So there is a few still
origin/2.11.x - looks like a mistake as there is the camel-2.11.x
origin/master-dev - is from 2013 and also looks like a mistake that
can be deleted
origin/trunk - was the name we used when doing the svn -> git and we
kept using it for a while, we can likely delete it
Any comments?
On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com> wrote:
> We got a bunch of remote branches that has been merged to master, or
> is no longer in use.
>
> I propose to remove all branches that are not camel release branches
> or master itself. And the old trunk branch (should it be kept?)
>
> These are the ones:
>
> origin/CAMEL-4232
> origin/CAMEL-6555
> origin/camel-atmos
> origin/camel-gora
> origin/camel-ignite
> origin/cxf3
> origin/cxf_wrong_content_length
> origin/feature/camel-hystrix
> origin/feature/camel-xmljson-legal-license-compliance
> origin/fix-8478
> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
> origin/jdk8-lambdas
> origin/jsonpath_encoding
> origin/osgi-trouble
> origin/temp-jetty9
> origin/temp-jetty9-2
>
>
> And what is this branch used for?
>
> origin/master-dev
>
>
> --
> 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: Cleanup remote branches
Posted by Claus Ibsen <cl...@gmail.com>.
Hi
Okay removed the last one, so its all nice and clean with only master
and camel-2.xx branches for our releases. And camel-1.xx for the 1.x
releases.
On Wed, Apr 13, 2016 at 9:27 AM, Gregor Zurowski
<gr...@list.zurowski.org> wrote:
> Looks good to me as well. Let's remove 2.11.x, master-dev and trunk.
>
> Thanks,
> Gregor
>
> On Tue, Apr 12, 2016 at 12:59 PM, Claus Ibsen <cl...@gmail.com> wrote:
>> Hi
>>
>> I have deleted some branches and we have now
>>
>> origin/2.11.x
>> origin/HEAD -> origin/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.7.x
>> origin/camel-2.8.x
>> origin/camel-2.9.x
>> origin/master
>> origin/master-dev
>> origin/trunk
>>
>>
>> So there is a few still
>>
>> origin/2.11.x - looks like a mistake as there is the camel-2.11.x
>> origin/master-dev - is from 2013 and also looks like a mistake that
>> can be deleted
>> origin/trunk - was the name we used when doing the svn -> git and we
>> kept using it for a while, we can likely delete it
>>
>>
>> Any comments?
>>
>>
>> On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com> wrote:
>>> We got a bunch of remote branches that has been merged to master, or
>>> is no longer in use.
>>>
>>> I propose to remove all branches that are not camel release branches
>>> or master itself. And the old trunk branch (should it be kept?)
>>>
>>> These are the ones:
>>>
>>> origin/CAMEL-4232
>>> origin/CAMEL-6555
>>> origin/camel-atmos
>>> origin/camel-gora
>>> origin/camel-ignite
>>> origin/cxf3
>>> origin/cxf_wrong_content_length
>>> origin/feature/camel-hystrix
>>> origin/feature/camel-xmljson-legal-license-compliance
>>> origin/fix-8478
>>> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
>>> origin/jdk8-lambdas
>>> origin/jsonpath_encoding
>>> origin/osgi-trouble
>>> origin/temp-jetty9
>>> origin/temp-jetty9-2
>>>
>>>
>>> And what is this branch used for?
>>>
>>> origin/master-dev
>>>
>>>
>>> --
>>> 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
--
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2
Re: Cleanup remote branches
Posted by Gregor Zurowski <gr...@list.zurowski.org>.
Looks good to me as well. Let's remove 2.11.x, master-dev and trunk.
Thanks,
Gregor
On Tue, Apr 12, 2016 at 12:59 PM, Claus Ibsen <cl...@gmail.com> wrote:
> Hi
>
> I have deleted some branches and we have now
>
> origin/2.11.x
> origin/HEAD -> origin/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.7.x
> origin/camel-2.8.x
> origin/camel-2.9.x
> origin/master
> origin/master-dev
> origin/trunk
>
>
> So there is a few still
>
> origin/2.11.x - looks like a mistake as there is the camel-2.11.x
> origin/master-dev - is from 2013 and also looks like a mistake that
> can be deleted
> origin/trunk - was the name we used when doing the svn -> git and we
> kept using it for a while, we can likely delete it
>
>
> Any comments?
>
>
> On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com> wrote:
>> We got a bunch of remote branches that has been merged to master, or
>> is no longer in use.
>>
>> I propose to remove all branches that are not camel release branches
>> or master itself. And the old trunk branch (should it be kept?)
>>
>> These are the ones:
>>
>> origin/CAMEL-4232
>> origin/CAMEL-6555
>> origin/camel-atmos
>> origin/camel-gora
>> origin/camel-ignite
>> origin/cxf3
>> origin/cxf_wrong_content_length
>> origin/feature/camel-hystrix
>> origin/feature/camel-xmljson-legal-license-compliance
>> origin/fix-8478
>> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
>> origin/jdk8-lambdas
>> origin/jsonpath_encoding
>> origin/osgi-trouble
>> origin/temp-jetty9
>> origin/temp-jetty9-2
>>
>>
>> And what is this branch used for?
>>
>> origin/master-dev
>>
>>
>> --
>> 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: Cleanup remote branches
Posted by Claus Ibsen <cl...@gmail.com>.
Hi
I have deleted some branches and we have now
origin/2.11.x
origin/HEAD -> origin/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.7.x
origin/camel-2.8.x
origin/camel-2.9.x
origin/master
origin/master-dev
origin/trunk
So there is a few still
origin/2.11.x - looks like a mistake as there is the camel-2.11.x
origin/master-dev - is from 2013 and also looks like a mistake that
can be deleted
origin/trunk - was the name we used when doing the svn -> git and we
kept using it for a while, we can likely delete it
Any comments?
On Thu, Mar 31, 2016 at 12:14 PM, Claus Ibsen <cl...@gmail.com> wrote:
> We got a bunch of remote branches that has been merged to master, or
> is no longer in use.
>
> I propose to remove all branches that are not camel release branches
> or master itself. And the old trunk branch (should it be kept?)
>
> These are the ones:
>
> origin/CAMEL-4232
> origin/CAMEL-6555
> origin/camel-atmos
> origin/camel-gora
> origin/camel-ignite
> origin/cxf3
> origin/cxf_wrong_content_length
> origin/feature/camel-hystrix
> origin/feature/camel-xmljson-legal-license-compliance
> origin/fix-8478
> origin/fix/CAMEL-8689-camel-dozer-classloading-issue
> origin/jdk8-lambdas
> origin/jsonpath_encoding
> origin/osgi-trouble
> origin/temp-jetty9
> origin/temp-jetty9-2
>
>
> And what is this branch used for?
>
> origin/master-dev
>
>
> --
> 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