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:The big issue with this workflow is that it forces to use cherry-pick
>> * 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).
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.
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.