Drupal does the "manual apply to each branch, newest first" approach as well. It's not perfect but it's worked for 11+ years and counting.

--Larry Garfield

On 09/22/2012 06:50 AM, Jérôme Vieilledent wrote:
Hi

That's the workflow we use for eZ Publish EE and it's perfectly fine :-)

--
Jérôme Vieilledent


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

--
If you want to report a vulnerability issue on symfony, please send it to 
security at symfony-project.com

You received this message because you are subscribed to the Google
Groups "symfony developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/symfony-devs?hl=en

Reply via email to