You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@myfaces.apache.org by Paul Nicolucci <pn...@us.ibm.com> on 2018/06/21 13:30:19 UTC
Re: Migrate all MyFaces projects to Git
I see we have a master branch on git as well as a "2.3.x_". I've been
committing changes for version 2.3.x to the master branch should we also
commit to the 2.3.x_ branch? Just want to ensure I'm doing the correct
deliveries.
I assume we just need to deliver to master for 2.3 changes right now and
then once we start a 2.4 etc we'll catch the 2.3.x branch up to master and
do new forward development in master?
Thanks,
Paul Nicolucci
From: Dennis Kieselhorst <de...@apache.org>
To: <de...@myfaces.apache.org>
Date: 05/23/2018 06:20 AM
Subject: Re: Migrate all MyFaces projects to Git
> AFAICS you merged the 2.3.x into master, right? Shoudln't we remove the
> 2.3.x branch then?
You are right. I was waiting for other opinions regarding 2.4.x in master.
For now I've removed the 2.3.x branch.
Regards
Dennis
Re: Migrate all MyFaces projects to Git
Posted by Werner Punz <we...@gmail.com>.
Ahh...
It could have been me accidentally pushing a local dev branch
At least from what it looks from the history.
(Commit: ed3c03ca2f7517fce95efdf624a07fe8d17defb4)
The best bet probably is to delete it.
Am Do., 21. Juni 2018 um 15:38 Uhr schrieb Thomas Andraschko <
andraschko.thomas@gmail.com>:
> Could it be related to the last release? @eduardo?
>
>
>
> 2018-06-21 15:36 GMT+02:00 Dennis Kieselhorst <de...@apache.org>:
>
>> I don't know who created 2.3.x_ and for what reason. 2.3.x is currently
>> on master and that's where we should release the next version.
>>
>> Best
>> Dennis
>>
>> On 2018/06/21 13:30:19, "Paul Nicolucci" <p....@us.ibm.com> wrote:
>> >
>> > I see we have a master branch on git as well as a "2.3.x_". I've been>
>> > committing changes for version 2.3.x to the master branch should we
>> also>
>> > commit to the 2.3.x_ branch? Just want to ensure I'm doing the correct>
>> > deliveries.>
>> >
>> > I assume we just need to deliver to master for 2.3 changes right now
>> and>
>> > then once we start a 2.4 etc we'll catch the 2.3.x branch up to master
>> and>
>> > do new forward development in master?>
>> >
>> > Thanks,>
>> >
>> > Paul Nicolucci>
>> >
>> >
>> >
>> > From: Dennis Kieselhorst <de...@apache.org>>
>> > To: <de...@myfaces.apache.org>>
>> > Date: 05/23/2018 06:20 AM>
>> > Subject: Re: Migrate all MyFaces projects to Git>
>> >
>> >
>> >
>> > > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove
>> the>
>> > > 2.3.x branch then?>
>> >
>> > You are right. I was waiting for other opinions regarding 2.4.x in
>> master.>
>> > For now I've removed the 2.3.x branch.>
>> >
>> > Regards>
>> > Dennis>
>> >
>> >
>> >
>> >
>>
>
>
Re: Migrate all MyFaces projects to Git
Posted by Thomas Andraschko <an...@gmail.com>.
all right :) Werner, can you just remove it?
I will probably do a small cleanup of the branches next month, there are so
many very very old unused branches.
2018-06-21 15:47 GMT+02:00 Eduardo B <eb...@gmail.com>:
> I haven't started any release process after the move to git. So not sure
> who created that 2.3.x_ branch. I've been committing the MyFaces 2.3
> changes only to master branch.
>
> Regards,
> Eduardo
>
> On Thu, Jun 21, 2018 at 9:38 AM, Thomas Andraschko <
> andraschko.thomas@gmail.com> wrote:
>
>> Could it be related to the last release? @eduardo?
>>
>>
>>
>> 2018-06-21 15:36 GMT+02:00 Dennis Kieselhorst <de...@apache.org>:
>>
>>> I don't know who created 2.3.x_ and for what reason. 2.3.x is currently
>>> on master and that's where we should release the next version.
>>>
>>> Best
>>> Dennis
>>>
>>> On 2018/06/21 13:30:19, "Paul Nicolucci" <p....@us.ibm.com> wrote:
>>> >
>>> > I see we have a master branch on git as well as a "2.3.x_". I've been>
>>> > committing changes for version 2.3.x to the master branch should we
>>> also>
>>> > commit to the 2.3.x_ branch? Just want to ensure I'm doing the correct>
>>> > deliveries.>
>>> >
>>> > I assume we just need to deliver to master for 2.3 changes right now
>>> and>
>>> > then once we start a 2.4 etc we'll catch the 2.3.x branch up to master
>>> and>
>>> > do new forward development in master?>
>>> >
>>> > Thanks,>
>>> >
>>> > Paul Nicolucci>
>>> >
>>> >
>>> >
>>> > From: Dennis Kieselhorst <de...@apache.org>>
>>> > To: <de...@myfaces.apache.org>>
>>> > Date: 05/23/2018 06:20 AM>
>>> > Subject: Re: Migrate all MyFaces projects to Git>
>>> >
>>> >
>>> >
>>> > > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove
>>> the>
>>> > > 2.3.x branch then?>
>>> >
>>> > You are right. I was waiting for other opinions regarding 2.4.x in
>>> master.>
>>> > For now I've removed the 2.3.x branch.>
>>> >
>>> > Regards>
>>> > Dennis>
>>> >
>>> >
>>> >
>>> >
>>>
>>
>>
>
Re: Migrate all MyFaces projects to Git
Posted by Thomas Andraschko <an...@gmail.com>.
Also deleted the unused branches now!
2018-06-21 17:23 GMT+02:00 Dennis Kieselhorst <de...@apache.org>:
> Great, thank you!
>
> On 2018/06/21 13:59:15, Werner Punz <w....@gmail.com> wrote:
> > Just deleted it...>
>
>
Re: Migrate all MyFaces projects to Git
Posted by Dennis Kieselhorst <de...@apache.org>.
Great, thank you!
On 2018/06/21 13:59:15, Werner Punz <w....@gmail.com> wrote:
> Just deleted it...>
Re: Migrate all MyFaces projects to Git
Posted by Werner Punz <we...@gmail.com>.
Just deleted it...
git branch --all
* master
remotes/origin/1.1.x
remotes/origin/1.2.x
remotes/origin/1_1_2
remotes/origin/1_1_3
remotes/origin/1_1_4
remotes/origin/1_1_5
remotes/origin/1_1_6
remotes/origin/1_1_6rc1
remotes/origin/1_1_7
remotes/origin/1_1_7prepare
remotes/origin/1_1_8
remotes/origin/1_2_0
remotes/origin/1_2_1
remotes/origin/1_2_2
remotes/origin/1_2_3
remotes/origin/1_2_4
remotes/origin/1_2_5
remotes/origin/1_2_6
remotes/origin/1_2_7
remotes/origin/1_2_8
remotes/origin/1_2_8prepare
remotes/origin/1_2_9
remotes/origin/2.0.8_shade_prototype
remotes/origin/2.0.8_windowid_prototype
remotes/origin/2.0.x
remotes/origin/2.0.x_refactor_shade_duplicate
remotes/origin/2.1.x
remotes/origin/2.1.x-client-window
remotes/origin/2.1.x-copy
remotes/origin/2.2.x
remotes/origin/2_0_0
remotes/origin/2_0_0_alpha
remotes/origin/2_0_0_beta
remotes/origin/2_0_0_beta_2
remotes/origin/2_0_0_beta_3
remotes/origin/2_0_0prepare
remotes/origin/2_0_1
remotes/origin/HEAD -> origin/master
remotes/origin/master
remotes/origin/matzew-branch
remotes/origin/refactor_shared_2_1_x
Cheers
Werner
Am Do., 21. Juni 2018 um 15:55 Uhr schrieb Thomas Andraschko <
andraschko.thomas@gmail.com>:
> No problem! Would be great if you can it!
>
> 2018-06-21 15:51 GMT+02:00 Werner Punz <we...@gmail.com>:
>
>> Yes it was me accidentally, and only commits from my side went in (which
>> also are in master)
>> Shall I delete the branch or does someone else want to do it.
>> Btw. sorry that it happened. I did not notice that intellij was pushing
>> the branch as well.
>>
>> Werner
>>
>>
>> Am Do., 21. Juni 2018 um 15:47 Uhr schrieb Eduardo B <eb...@gmail.com>:
>>
>>> I haven't started any release process after the move to git. So not sure
>>> who created that 2.3.x_ branch. I've been committing the MyFaces 2.3
>>> changes only to master branch.
>>>
>>> Regards,
>>> Eduardo
>>>
>>> On Thu, Jun 21, 2018 at 9:38 AM, Thomas Andraschko <
>>> andraschko.thomas@gmail.com> wrote:
>>>
>>>> Could it be related to the last release? @eduardo?
>>>>
>>>>
>>>>
>>>> 2018-06-21 15:36 GMT+02:00 Dennis Kieselhorst <de...@apache.org>:
>>>>
>>>>> I don't know who created 2.3.x_ and for what reason. 2.3.x is currently
>>>>> on master and that's where we should release the next version.
>>>>>
>>>>> Best
>>>>> Dennis
>>>>>
>>>>> On 2018/06/21 13:30:19, "Paul Nicolucci" <p....@us.ibm.com> wrote:
>>>>> >
>>>>> > I see we have a master branch on git as well as a "2.3.x_". I've
>>>>> been>
>>>>> > committing changes for version 2.3.x to the master branch should we
>>>>> also>
>>>>> > commit to the 2.3.x_ branch? Just want to ensure I'm doing the
>>>>> correct>
>>>>> > deliveries.>
>>>>> >
>>>>> > I assume we just need to deliver to master for 2.3 changes right now
>>>>> and>
>>>>> > then once we start a 2.4 etc we'll catch the 2.3.x branch up to
>>>>> master
>>>>> and>
>>>>> > do new forward development in master?>
>>>>> >
>>>>> > Thanks,>
>>>>> >
>>>>> > Paul Nicolucci>
>>>>> >
>>>>> >
>>>>> >
>>>>> > From: Dennis Kieselhorst <de...@apache.org>>
>>>>> > To: <de...@myfaces.apache.org>>
>>>>> > Date: 05/23/2018 06:20 AM>
>>>>> > Subject: Re: Migrate all MyFaces projects to Git>
>>>>> >
>>>>> >
>>>>> >
>>>>> > > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove
>>>>> the>
>>>>> > > 2.3.x branch then?>
>>>>> >
>>>>> > You are right. I was waiting for other opinions regarding 2.4.x in
>>>>> master.>
>>>>> > For now I've removed the 2.3.x branch.>
>>>>> >
>>>>> > Regards>
>>>>> > Dennis>
>>>>> >
>>>>> >
>>>>> >
>>>>> >
>>>>>
>>>>
>>>>
>>>
>
Re: Migrate all MyFaces projects to Git
Posted by Thomas Andraschko <an...@gmail.com>.
No problem! Would be great if you can it!
2018-06-21 15:51 GMT+02:00 Werner Punz <we...@gmail.com>:
> Yes it was me accidentally, and only commits from my side went in (which
> also are in master)
> Shall I delete the branch or does someone else want to do it.
> Btw. sorry that it happened. I did not notice that intellij was pushing
> the branch as well.
>
> Werner
>
>
> Am Do., 21. Juni 2018 um 15:47 Uhr schrieb Eduardo B <eb...@gmail.com>:
>
>> I haven't started any release process after the move to git. So not sure
>> who created that 2.3.x_ branch. I've been committing the MyFaces 2.3
>> changes only to master branch.
>>
>> Regards,
>> Eduardo
>>
>> On Thu, Jun 21, 2018 at 9:38 AM, Thomas Andraschko <
>> andraschko.thomas@gmail.com> wrote:
>>
>>> Could it be related to the last release? @eduardo?
>>>
>>>
>>>
>>> 2018-06-21 15:36 GMT+02:00 Dennis Kieselhorst <de...@apache.org>:
>>>
>>>> I don't know who created 2.3.x_ and for what reason. 2.3.x is currently
>>>> on master and that's where we should release the next version.
>>>>
>>>> Best
>>>> Dennis
>>>>
>>>> On 2018/06/21 13:30:19, "Paul Nicolucci" <p....@us.ibm.com> wrote:
>>>> >
>>>> > I see we have a master branch on git as well as a "2.3.x_". I've been>
>>>> > committing changes for version 2.3.x to the master branch should we
>>>> also>
>>>> > commit to the 2.3.x_ branch? Just want to ensure I'm doing the
>>>> correct>
>>>> > deliveries.>
>>>> >
>>>> > I assume we just need to deliver to master for 2.3 changes right now
>>>> and>
>>>> > then once we start a 2.4 etc we'll catch the 2.3.x branch up to master
>>>> and>
>>>> > do new forward development in master?>
>>>> >
>>>> > Thanks,>
>>>> >
>>>> > Paul Nicolucci>
>>>> >
>>>> >
>>>> >
>>>> > From: Dennis Kieselhorst <de...@apache.org>>
>>>> > To: <de...@myfaces.apache.org>>
>>>> > Date: 05/23/2018 06:20 AM>
>>>> > Subject: Re: Migrate all MyFaces projects to Git>
>>>> >
>>>> >
>>>> >
>>>> > > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove
>>>> the>
>>>> > > 2.3.x branch then?>
>>>> >
>>>> > You are right. I was waiting for other opinions regarding 2.4.x in
>>>> master.>
>>>> > For now I've removed the 2.3.x branch.>
>>>> >
>>>> > Regards>
>>>> > Dennis>
>>>> >
>>>> >
>>>> >
>>>> >
>>>>
>>>
>>>
>>
Re: Migrate all MyFaces projects to Git
Posted by Werner Punz <we...@gmail.com>.
Yes it was me accidentally, and only commits from my side went in (which
also are in master)
Shall I delete the branch or does someone else want to do it.
Btw. sorry that it happened. I did not notice that intellij was pushing the
branch as well.
Werner
Am Do., 21. Juni 2018 um 15:47 Uhr schrieb Eduardo B <eb...@gmail.com>:
> I haven't started any release process after the move to git. So not sure
> who created that 2.3.x_ branch. I've been committing the MyFaces 2.3
> changes only to master branch.
>
> Regards,
> Eduardo
>
> On Thu, Jun 21, 2018 at 9:38 AM, Thomas Andraschko <
> andraschko.thomas@gmail.com> wrote:
>
>> Could it be related to the last release? @eduardo?
>>
>>
>>
>> 2018-06-21 15:36 GMT+02:00 Dennis Kieselhorst <de...@apache.org>:
>>
>>> I don't know who created 2.3.x_ and for what reason. 2.3.x is currently
>>> on master and that's where we should release the next version.
>>>
>>> Best
>>> Dennis
>>>
>>> On 2018/06/21 13:30:19, "Paul Nicolucci" <p....@us.ibm.com> wrote:
>>> >
>>> > I see we have a master branch on git as well as a "2.3.x_". I've been>
>>> > committing changes for version 2.3.x to the master branch should we
>>> also>
>>> > commit to the 2.3.x_ branch? Just want to ensure I'm doing the correct>
>>> > deliveries.>
>>> >
>>> > I assume we just need to deliver to master for 2.3 changes right now
>>> and>
>>> > then once we start a 2.4 etc we'll catch the 2.3.x branch up to master
>>> and>
>>> > do new forward development in master?>
>>> >
>>> > Thanks,>
>>> >
>>> > Paul Nicolucci>
>>> >
>>> >
>>> >
>>> > From: Dennis Kieselhorst <de...@apache.org>>
>>> > To: <de...@myfaces.apache.org>>
>>> > Date: 05/23/2018 06:20 AM>
>>> > Subject: Re: Migrate all MyFaces projects to Git>
>>> >
>>> >
>>> >
>>> > > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove
>>> the>
>>> > > 2.3.x branch then?>
>>> >
>>> > You are right. I was waiting for other opinions regarding 2.4.x in
>>> master.>
>>> > For now I've removed the 2.3.x branch.>
>>> >
>>> > Regards>
>>> > Dennis>
>>> >
>>> >
>>> >
>>> >
>>>
>>
>>
>
Re: Migrate all MyFaces projects to Git
Posted by Eduardo B <eb...@gmail.com>.
I haven't started any release process after the move to git. So not sure
who created that 2.3.x_ branch. I've been committing the MyFaces 2.3
changes only to master branch.
Regards,
Eduardo
On Thu, Jun 21, 2018 at 9:38 AM, Thomas Andraschko <
andraschko.thomas@gmail.com> wrote:
> Could it be related to the last release? @eduardo?
>
>
>
> 2018-06-21 15:36 GMT+02:00 Dennis Kieselhorst <de...@apache.org>:
>
>> I don't know who created 2.3.x_ and for what reason. 2.3.x is currently
>> on master and that's where we should release the next version.
>>
>> Best
>> Dennis
>>
>> On 2018/06/21 13:30:19, "Paul Nicolucci" <p....@us.ibm.com> wrote:
>> >
>> > I see we have a master branch on git as well as a "2.3.x_". I've been>
>> > committing changes for version 2.3.x to the master branch should we
>> also>
>> > commit to the 2.3.x_ branch? Just want to ensure I'm doing the correct>
>> > deliveries.>
>> >
>> > I assume we just need to deliver to master for 2.3 changes right now
>> and>
>> > then once we start a 2.4 etc we'll catch the 2.3.x branch up to master
>> and>
>> > do new forward development in master?>
>> >
>> > Thanks,>
>> >
>> > Paul Nicolucci>
>> >
>> >
>> >
>> > From: Dennis Kieselhorst <de...@apache.org>>
>> > To: <de...@myfaces.apache.org>>
>> > Date: 05/23/2018 06:20 AM>
>> > Subject: Re: Migrate all MyFaces projects to Git>
>> >
>> >
>> >
>> > > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove
>> the>
>> > > 2.3.x branch then?>
>> >
>> > You are right. I was waiting for other opinions regarding 2.4.x in
>> master.>
>> > For now I've removed the 2.3.x branch.>
>> >
>> > Regards>
>> > Dennis>
>> >
>> >
>> >
>> >
>>
>
>
Re: Migrate all MyFaces projects to Git
Posted by Thomas Andraschko <an...@gmail.com>.
Could it be related to the last release? @eduardo?
2018-06-21 15:36 GMT+02:00 Dennis Kieselhorst <de...@apache.org>:
> I don't know who created 2.3.x_ and for what reason. 2.3.x is currently
> on master and that's where we should release the next version.
>
> Best
> Dennis
>
> On 2018/06/21 13:30:19, "Paul Nicolucci" <p....@us.ibm.com> wrote:
> >
> > I see we have a master branch on git as well as a "2.3.x_". I've been>
> > committing changes for version 2.3.x to the master branch should we also>
> > commit to the 2.3.x_ branch? Just want to ensure I'm doing the correct>
> > deliveries.>
> >
> > I assume we just need to deliver to master for 2.3 changes right now and>
> > then once we start a 2.4 etc we'll catch the 2.3.x branch up to master
> and>
> > do new forward development in master?>
> >
> > Thanks,>
> >
> > Paul Nicolucci>
> >
> >
> >
> > From: Dennis Kieselhorst <de...@apache.org>>
> > To: <de...@myfaces.apache.org>>
> > Date: 05/23/2018 06:20 AM>
> > Subject: Re: Migrate all MyFaces projects to Git>
> >
> >
> >
> > > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove
> the>
> > > 2.3.x branch then?>
> >
> > You are right. I was waiting for other opinions regarding 2.4.x in
> master.>
> > For now I've removed the 2.3.x branch.>
> >
> > Regards>
> > Dennis>
> >
> >
> >
> >
>
Re: Migrate all MyFaces projects to Git
Posted by Dennis Kieselhorst <de...@apache.org>.
I don't know who created 2.3.x_ and for what reason. 2.3.x is currently
on master and that's where we should release the next version.
Best
Dennis
On 2018/06/21 13:30:19, "Paul Nicolucci" <p....@us.ibm.com> wrote:
>
> I see we have a master branch on git as well as a "2.3.x_". I've been>
> committing changes for version 2.3.x to the master branch should we also>
> commit to the 2.3.x_ branch? Just want to ensure I'm doing the correct>
> deliveries.>
>
> I assume we just need to deliver to master for 2.3 changes right now and>
> then once we start a 2.4 etc we'll catch the 2.3.x branch up to master
and>
> do new forward development in master?>
>
> Thanks,>
>
> Paul Nicolucci>
>
>
>
> From: Dennis Kieselhorst <de...@apache.org>>
> To: <de...@myfaces.apache.org>>
> Date: 05/23/2018 06:20 AM>
> Subject: Re: Migrate all MyFaces projects to Git>
>
>
>
> > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove
the>
> > 2.3.x branch then?>
>
> You are right. I was waiting for other opinions regarding 2.4.x in
master.>
> For now I've removed the 2.3.x branch.>
>
> Regards>
> Dennis>
>
>
>
>
Re: Migrate all MyFaces projects to Git
Posted by Thomas Andraschko <an...@gmail.com>.
Hm? I thought dennis removed the the 2.3.x branch?
2018-06-21 15:30 GMT+02:00 Paul Nicolucci <pn...@us.ibm.com>:
> I see we have a master branch on git as well as a "2.3.x_". I've been
> committing changes for version 2.3.x to the master branch should we also
> commit to the 2.3.x_ branch? Just want to ensure I'm doing the correct
> deliveries.
>
> I assume we just need to deliver to master for 2.3 changes right now and
> then once we start a 2.4 etc we'll catch the 2.3.x branch up to master and
> do new forward development in master?
>
> Thanks,
>
> Paul Nicolucci
>
> [image: Inactive hide details for Dennis Kieselhorst ---05/23/2018
> 06:20:13 AM---> AFAICS you merged the 2.3.x into master, right? Shou]Dennis
> Kieselhorst ---05/23/2018 06:20:13 AM---> AFAICS you merged the 2.3.x into
> master, right? Shoudln't we remove the > 2.3.x branch then?
>
> From: Dennis Kieselhorst <de...@apache.org>
> To: <de...@myfaces.apache.org>
> Date: 05/23/2018 06:20 AM
> Subject: Re: Migrate all MyFaces projects to Git
> ------------------------------
>
>
>
> > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove the
> > 2.3.x branch then?
>
> You are right. I was waiting for other opinions regarding 2.4.x in master.
> For now I've removed the 2.3.x branch.
>
> Regards
> Dennis
>
>
>
>
>
Re: Migrate all MyFaces projects to Git
Posted by Werner Punz <we...@gmail.com>.
Thanks for asking, I was a little bit puzzled as well.
I ended up committing it into master and cherry picking my changes
into 2.3.x_
Werner
Am Do., 21. Juni 2018 um 15:32 Uhr schrieb Paul Nicolucci <
pnicoluc@us.ibm.com>:
> I see we have a master branch on git as well as a "2.3.x_". I've been
> committing changes for version 2.3.x to the master branch should we also
> commit to the 2.3.x_ branch? Just want to ensure I'm doing the correct
> deliveries.
>
> I assume we just need to deliver to master for 2.3 changes right now and
> then once we start a 2.4 etc we'll catch the 2.3.x branch up to master and
> do new forward development in master?
>
> Thanks,
>
> Paul Nicolucci
>
> [image: Inactive hide details for Dennis Kieselhorst ---05/23/2018
> 06:20:13 AM---> AFAICS you merged the 2.3.x into master, right? Shou]Dennis
> Kieselhorst ---05/23/2018 06:20:13 AM---> AFAICS you merged the 2.3.x into
> master, right? Shoudln't we remove the > 2.3.x branch then?
>
> From: Dennis Kieselhorst <de...@apache.org>
> To: <de...@myfaces.apache.org>
> Date: 05/23/2018 06:20 AM
> Subject: Re: Migrate all MyFaces projects to Git
> ------------------------------
>
>
>
> > AFAICS you merged the 2.3.x into master, right? Shoudln't we remove the
> > 2.3.x branch then?
>
> You are right. I was waiting for other opinions regarding 2.4.x in master.
> For now I've removed the 2.3.x branch.
>
> Regards
> Dennis
>
>
>
>
>