Account Options

  1. Sign in
The old Google Groups will be going away soon, but your browser is incompatible with the new version.
Google Groups Home
« Groups Home
Message from discussion A formal release process proposal
The group you are posting to is a Usenet group. Messages posted to this group will make your email address visible to anyone on the Internet.
Your reply message has not been sent.
Your post will appear after it is approved by moderators
 
From:
To:
Cc:
Followup To:
Add Cc | Add Followup-to | Edit Subject
Subject:
Validation:
For verification purposes please type the characters you see in the picture below or the numbers you hear by clicking the accessibility icon. Listen and type the numbers you hear
 
Christophe COEVOET  
View profile  
 More options Sep 22 2012, 7:44 am
From: Christophe COEVOET <s...@notk.org>
Date: Sat, 22 Sep 2012 13:44:03 +0200
Local: Sat, Sep 22 2012 7:44 am
Subject: Re: [symfony-devs] A formal release process proposal
Le 22/09/2012 09:19, Lukas Kahwe Smith a crit :
> On 21.09.2012, at 08:45, Fabien Potencier <fabien.potenc...@symfony-project.com> wrote:

>> * merging 2.0 into 2.1 is a major PITA (just for me actually) as all the tests were moved in 2.1, and because the form framework evolved a lot as well, so it takes me more and more time to merge 2.0 into 2.1;

>> * we can decide to keep the 2 months period but still accept security fixes for a longer period of time (6 months).
> we talked about changing the merging policy in Denver. ie. we would merge bug fixes to master and then merge it down ro previous releases. i dont remember the pros and cons we listes back then. but it might become more necessary to enable delegation of responsibility.

> regards,
> Lukas

The big issue with this workflow is that it forces to use cherry-pick
for older branches instead of merging them together. So changes are
applied in the maintenance branch but with a different commit hash.
This is what Doctrine does and it makes it impossible to ask git which
commits have been backported (a diff will show the commits being new in
master even if they have a cherry-picked version). It requires doing the
history diff by hand each time.

--
Christophe | Stof


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.