You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@activemq.apache.org by Hadrian Zbarcea <hz...@gmail.com> on 2015/02/03 22:14:20 UTC
[HEADS-UP][DISCUSS] Renaming "trunk" to "master"
Per agreement in this thread, now that 5.11.0 is out, I sent a request
to infra [1] to rename trunk to master.
Please keep an eye on it so you don't loose work.
Cheers,
Hadrian
[1] https://issues.apache.org/jira/browse/INFRA-9111
On 01/06/2015 07:58 AM, Dejan Bosanac wrote:
> +1
>
> Maybe we should wait with the rename until we have 5.11.0 released (there’s
> some work involved like reconfiguring jenkins and stuff, so it'll delay
> release)
>
> Regards
> --
> Dejan Bosanac
> ----------------------
> Red Hat, Inc.
> dbosanac@redhat.com
> Twitter: @dejanb
> Blog: http://sensatic.net
> ActiveMQ in Action: http://www.manning.com/snyder/
>
> On Tue, Jan 6, 2015 at 1:44 PM, Robbie Gemmell <ro...@gmail.com>
> wrote:
>
>> +1 for the rename.
>>
>> Using "master" is typical and this is definitely a change now made by
>> infra during migrations, based on experience of migrating a couple of
>> things into Git repos at Qpid recently.
>>
>> On 5 January 2015 at 18:27, Hadrian Zbarcea <hz...@gmail.com> wrote:
>>> It's a bit confusing, a leftover from the svn days.
>>>
>>> I think the rename was supposed to happen but it was somehow overlooked.
>> Any
>>> objection to rename?
>>>
>>> Hadrian
Re: [IMPORTANT][HEADS-UP] Renaming "trunk" to "master"
Posted by Jon Anstey <ja...@gmail.com>.
Yeah, we dont need trunk. I must have pushed that by mistake. Will try and
remove it.
On Apr 24, 2015 8:13 AM, "Robbie Gemmell" <ro...@gmail.com> wrote:
> I noticed from a comment on AMQ-5503 that we seem to have a trunk
> branch again:
> https://git1-us-west.apache.org/repos/asf?p=activemq.git;a=shortlog;h=refs/heads/trunk
>
> There were a few commits on it in March. The first looks to be on
> master too, and the others look to be a change and subsequent revert,
> so can we simply delete the branch?
>
> Robbie
>
> On 10 February 2015 at 04:18, Hadrian Zbarcea <hz...@gmail.com> wrote:
> > Done. Please make sure you merge your local trunk to master and continue
> to
> > work on master.
> >
> > If you push trunk, there is nothing that prevents the creation of a new
> > branch 'trunk' that we'll have to merge and remove again.
> >
> > Thanks,
> > Hadrian
> >
> >
> >
> > On 02/08/2015 09:16 PM, Hadrian Zbarcea wrote:
> >>
> >> Hi,
> >>
> >> I created the master branch myself.
> >>
> >> INFRA-9111 is still open. I don't have the karma to remove the 'trunk'
> >> branch. Please use 'master' from now on. Let's follow the commits to
> trunk
> >> and merge them to master, make sure nothing gets lost.
> >>
> >> Cheers,
> >> Hadrian
> >>
> >>
> >> On 02/03/2015 04:14 PM, Hadrian Zbarcea wrote:
> >>>
> >>> Per agreement in this thread, now that 5.11.0 is out, I sent a request
> to
> >>> infra [1] to rename trunk to master.
> >>> Please keep an eye on it so you don't loose work.
> >>>
> >>> Cheers,
> >>> Hadrian
> >>>
> >>>
> >>> [1] https://issues.apache.org/jira/browse/INFRA-9111
> >>>
> >>>
> >>> On 01/06/2015 07:58 AM, Dejan Bosanac wrote:
> >>>>
> >>>> +1
> >>>>
> >>>> Maybe we should wait with the rename until we have 5.11.0 released
> >>>> (there’s
> >>>> some work involved like reconfiguring jenkins and stuff, so it'll
> delay
> >>>> release)
> >>>>
> >>>> Regards
> >>>> --
> >>>> Dejan Bosanac
> >>>> ----------------------
> >>>> Red Hat, Inc.
> >>>> dbosanac@redhat.com
> >>>> Twitter: @dejanb
> >>>> Blog: http://sensatic.net
> >>>> ActiveMQ in Action: http://www.manning.com/snyder/
> >>>>
> >>>> On Tue, Jan 6, 2015 at 1:44 PM, Robbie Gemmell
> >>>> <ro...@gmail.com>
> >>>> wrote:
> >>>>
> >>>>> +1 for the rename.
> >>>>>
> >>>>> Using "master" is typical and this is definitely a change now made by
> >>>>> infra during migrations, based on experience of migrating a couple of
> >>>>> things into Git repos at Qpid recently.
> >>>>>
> >>>>> On 5 January 2015 at 18:27, Hadrian Zbarcea <hz...@gmail.com>
> wrote:
> >>>>>>
> >>>>>> It's a bit confusing, a leftover from the svn days.
> >>>>>>
> >>>>>> I think the rename was supposed to happen but it was somehow
> >>>>>> overlooked.
> >>>>>
> >>>>> Any
> >>>>>>
> >>>>>> objection to rename?
> >>>>>>
> >>>>>> Hadrian
> >>>
> >>>
> >>
> >
>
Re: [IMPORTANT][HEADS-UP] Renaming "trunk" to "master"
Posted by Robbie Gemmell <ro...@gmail.com>.
I noticed from a comment on AMQ-5503 that we seem to have a trunk
branch again: https://git1-us-west.apache.org/repos/asf?p=activemq.git;a=shortlog;h=refs/heads/trunk
There were a few commits on it in March. The first looks to be on
master too, and the others look to be a change and subsequent revert,
so can we simply delete the branch?
Robbie
On 10 February 2015 at 04:18, Hadrian Zbarcea <hz...@gmail.com> wrote:
> Done. Please make sure you merge your local trunk to master and continue to
> work on master.
>
> If you push trunk, there is nothing that prevents the creation of a new
> branch 'trunk' that we'll have to merge and remove again.
>
> Thanks,
> Hadrian
>
>
>
> On 02/08/2015 09:16 PM, Hadrian Zbarcea wrote:
>>
>> Hi,
>>
>> I created the master branch myself.
>>
>> INFRA-9111 is still open. I don't have the karma to remove the 'trunk'
>> branch. Please use 'master' from now on. Let's follow the commits to trunk
>> and merge them to master, make sure nothing gets lost.
>>
>> Cheers,
>> Hadrian
>>
>>
>> On 02/03/2015 04:14 PM, Hadrian Zbarcea wrote:
>>>
>>> Per agreement in this thread, now that 5.11.0 is out, I sent a request to
>>> infra [1] to rename trunk to master.
>>> Please keep an eye on it so you don't loose work.
>>>
>>> Cheers,
>>> Hadrian
>>>
>>>
>>> [1] https://issues.apache.org/jira/browse/INFRA-9111
>>>
>>>
>>> On 01/06/2015 07:58 AM, Dejan Bosanac wrote:
>>>>
>>>> +1
>>>>
>>>> Maybe we should wait with the rename until we have 5.11.0 released
>>>> (there’s
>>>> some work involved like reconfiguring jenkins and stuff, so it'll delay
>>>> release)
>>>>
>>>> Regards
>>>> --
>>>> Dejan Bosanac
>>>> ----------------------
>>>> Red Hat, Inc.
>>>> dbosanac@redhat.com
>>>> Twitter: @dejanb
>>>> Blog: http://sensatic.net
>>>> ActiveMQ in Action: http://www.manning.com/snyder/
>>>>
>>>> On Tue, Jan 6, 2015 at 1:44 PM, Robbie Gemmell
>>>> <ro...@gmail.com>
>>>> wrote:
>>>>
>>>>> +1 for the rename.
>>>>>
>>>>> Using "master" is typical and this is definitely a change now made by
>>>>> infra during migrations, based on experience of migrating a couple of
>>>>> things into Git repos at Qpid recently.
>>>>>
>>>>> On 5 January 2015 at 18:27, Hadrian Zbarcea <hz...@gmail.com> wrote:
>>>>>>
>>>>>> It's a bit confusing, a leftover from the svn days.
>>>>>>
>>>>>> I think the rename was supposed to happen but it was somehow
>>>>>> overlooked.
>>>>>
>>>>> Any
>>>>>>
>>>>>> objection to rename?
>>>>>>
>>>>>> Hadrian
>>>
>>>
>>
>
[IMPORTANT][HEADS-UP] Renaming "trunk" to "master"
Posted by Hadrian Zbarcea <hz...@gmail.com>.
Done. Please make sure you merge your local trunk to master and continue
to work on master.
If you push trunk, there is nothing that prevents the creation of a new
branch 'trunk' that we'll have to merge and remove again.
Thanks,
Hadrian
On 02/08/2015 09:16 PM, Hadrian Zbarcea wrote:
> Hi,
>
> I created the master branch myself.
>
> INFRA-9111 is still open. I don't have the karma to remove the 'trunk'
> branch. Please use 'master' from now on. Let's follow the commits to
> trunk and merge them to master, make sure nothing gets lost.
>
> Cheers,
> Hadrian
>
>
> On 02/03/2015 04:14 PM, Hadrian Zbarcea wrote:
>> Per agreement in this thread, now that 5.11.0 is out, I sent a
>> request to infra [1] to rename trunk to master.
>> Please keep an eye on it so you don't loose work.
>>
>> Cheers,
>> Hadrian
>>
>>
>> [1] https://issues.apache.org/jira/browse/INFRA-9111
>>
>>
>> On 01/06/2015 07:58 AM, Dejan Bosanac wrote:
>>> +1
>>>
>>> Maybe we should wait with the rename until we have 5.11.0 released
>>> (there’s
>>> some work involved like reconfiguring jenkins and stuff, so it'll delay
>>> release)
>>>
>>> Regards
>>> --
>>> Dejan Bosanac
>>> ----------------------
>>> Red Hat, Inc.
>>> dbosanac@redhat.com
>>> Twitter: @dejanb
>>> Blog: http://sensatic.net
>>> ActiveMQ in Action: http://www.manning.com/snyder/
>>>
>>> On Tue, Jan 6, 2015 at 1:44 PM, Robbie Gemmell
>>> <ro...@gmail.com>
>>> wrote:
>>>
>>>> +1 for the rename.
>>>>
>>>> Using "master" is typical and this is definitely a change now made by
>>>> infra during migrations, based on experience of migrating a couple of
>>>> things into Git repos at Qpid recently.
>>>>
>>>> On 5 January 2015 at 18:27, Hadrian Zbarcea <hz...@gmail.com>
>>>> wrote:
>>>>> It's a bit confusing, a leftover from the svn days.
>>>>>
>>>>> I think the rename was supposed to happen but it was somehow
>>>>> overlooked.
>>>> Any
>>>>> objection to rename?
>>>>>
>>>>> Hadrian
>>
>
Re: [HEADS-UP][DISCUSS] Renaming "trunk" to "master"
Posted by artnaseef <ar...@artnaseef.com>.
Thank you Hadrian.
--
View this message in context: http://activemq.2283324.n4.nabble.com/DISCUSS-Renaming-trunk-to-master-tp4689494p4691265.html
Sent from the ActiveMQ - Dev mailing list archive at Nabble.com.
Re: [HEADS-UP][DISCUSS] Renaming "trunk" to "master"
Posted by Hadrian Zbarcea <hz...@gmail.com>.
Hi,
I created the master branch myself.
INFRA-9111 is still open. I don't have the karma to remove the 'trunk'
branch. Please use 'master' from now on. Let's follow the commits to
trunk and merge them to master, make sure nothing gets lost.
Cheers,
Hadrian
On 02/03/2015 04:14 PM, Hadrian Zbarcea wrote:
> Per agreement in this thread, now that 5.11.0 is out, I sent a request
> to infra [1] to rename trunk to master.
> Please keep an eye on it so you don't loose work.
>
> Cheers,
> Hadrian
>
>
> [1] https://issues.apache.org/jira/browse/INFRA-9111
>
>
> On 01/06/2015 07:58 AM, Dejan Bosanac wrote:
>> +1
>>
>> Maybe we should wait with the rename until we have 5.11.0 released
>> (there’s
>> some work involved like reconfiguring jenkins and stuff, so it'll delay
>> release)
>>
>> Regards
>> --
>> Dejan Bosanac
>> ----------------------
>> Red Hat, Inc.
>> dbosanac@redhat.com
>> Twitter: @dejanb
>> Blog: http://sensatic.net
>> ActiveMQ in Action: http://www.manning.com/snyder/
>>
>> On Tue, Jan 6, 2015 at 1:44 PM, Robbie Gemmell
>> <ro...@gmail.com>
>> wrote:
>>
>>> +1 for the rename.
>>>
>>> Using "master" is typical and this is definitely a change now made by
>>> infra during migrations, based on experience of migrating a couple of
>>> things into Git repos at Qpid recently.
>>>
>>> On 5 January 2015 at 18:27, Hadrian Zbarcea <hz...@gmail.com> wrote:
>>>> It's a bit confusing, a leftover from the svn days.
>>>>
>>>> I think the rename was supposed to happen but it was somehow
>>>> overlooked.
>>> Any
>>>> objection to rename?
>>>>
>>>> Hadrian
>