You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltaspike.apache.org by Gerhard Petracek <ge...@gmail.com> on 2012/02/13 13:49:56 UTC
release branches
hi @ all,
since a new commit was pushed before we merged back the release branch, we
have to discuss release branches right now.
the options i see right now are:
1) we push the external named release-branch as it is (+ tag) and rebase
the master
2) we merge the external release branch locally and just push the result
as i did with the master at [1]
3) we don't allow pushes (in the future) before we pushed the fast
forwarded master.
regards,
gerhard
[1] https://github.com/os890/DS_Discuss
Re: release branches
Posted by Jason Porter <li...@gmail.com>.
I like #1 or #2. #3 is limiting.
On Mon, Feb 13, 2012 at 05:49, Gerhard Petracek
<ge...@gmail.com>wrote:
> hi @ all,
>
> since a new commit was pushed before we merged back the release branch, we
> have to discuss release branches right now.
>
> the options i see right now are:
> 1) we push the external named release-branch as it is (+ tag) and rebase
> the master
> 2) we merge the external release branch locally and just push the result
> as i did with the master at [1]
> 3) we don't allow pushes (in the future) before we pushed the fast
> forwarded master.
>
> regards,
> gerhard
>
> [1] https://github.com/os890/DS_Discuss
>
--
Jason Porter
http://lightguard-jp.blogspot.com
http://twitter.com/lightguardjp
Software Engineer
Open Source Advocate
Author of Seam Catch - Next Generation Java Exception Handling
PGP key id: 926CCFF5
PGP key available at: keyserver.net, pgp.mit.edu
Re: release branches
Posted by Christian Kaltepoth <ch...@kaltepoth.de>.
+1 for Mark's suggestion.
2012/2/13 Gerhard Petracek <ge...@gmail.com>:
> +1
>
> regards,
> gerhard
>
>
>
> 2012/2/13 Mark Struberg <st...@yahoo.de>
>
>> I'd say we just push the release-branch + the release-tag and then merge
>> them over to master. This is only needed to upgrade the versions.
>>
>> LieGrue,
>> strub
>>
>>
>> >________________________________
>> > From: Gerhard Petracek <ge...@gmail.com>
>> >To: deltaspike <de...@incubator.apache.org>
>> >Sent: Monday, February 13, 2012 1:49 PM
>> >Subject: release branches
>> >
>> >hi @ all,
>> >
>> >since a new commit was pushed before we merged back the release branch, we
>> >have to discuss release branches right now.
>> >
>> >the options i see right now are:
>> >1) we push the external named release-branch as it is (+ tag) and rebase
>> >the master
>> >2) we merge the external release branch locally and just push the result
>> >as i did with the master at [1]
>> >3) we don't allow pushes (in the future) before we pushed the fast
>> >forwarded master.
>> >
>> >regards,
>> >gerhard
>> >
>> >[1] https://github.com/os890/DS_Discuss
>> >
>> >
>> >
>>
--
Christian Kaltepoth
Blog: http://chkal.blogspot.com/
Twitter: http://twitter.com/chkal
Re: release branches
Posted by Gerhard Petracek <ge...@gmail.com>.
+1
regards,
gerhard
2012/2/13 Mark Struberg <st...@yahoo.de>
> I'd say we just push the release-branch + the release-tag and then merge
> them over to master. This is only needed to upgrade the versions.
>
> LieGrue,
> strub
>
>
> >________________________________
> > From: Gerhard Petracek <ge...@gmail.com>
> >To: deltaspike <de...@incubator.apache.org>
> >Sent: Monday, February 13, 2012 1:49 PM
> >Subject: release branches
> >
> >hi @ all,
> >
> >since a new commit was pushed before we merged back the release branch, we
> >have to discuss release branches right now.
> >
> >the options i see right now are:
> >1) we push the external named release-branch as it is (+ tag) and rebase
> >the master
> >2) we merge the external release branch locally and just push the result
> >as i did with the master at [1]
> >3) we don't allow pushes (in the future) before we pushed the fast
> >forwarded master.
> >
> >regards,
> >gerhard
> >
> >[1] https://github.com/os890/DS_Discuss
> >
> >
> >
>
Re: release branches
Posted by Mark Struberg <st...@yahoo.de>.
I'd say we just push the release-branch + the release-tag and then merge them over to master. This is only needed to upgrade the versions.
LieGrue,
strub
>________________________________
> From: Gerhard Petracek <ge...@gmail.com>
>To: deltaspike <de...@incubator.apache.org>
>Sent: Monday, February 13, 2012 1:49 PM
>Subject: release branches
>
>hi @ all,
>
>since a new commit was pushed before we merged back the release branch, we
>have to discuss release branches right now.
>
>the options i see right now are:
>1) we push the external named release-branch as it is (+ tag) and rebase
>the master
>2) we merge the external release branch locally and just push the result
>as i did with the master at [1]
>3) we don't allow pushes (in the future) before we pushed the fast
>forwarded master.
>
>regards,
>gerhard
>
>[1] https://github.com/os890/DS_Discuss
>
>
>