create a new branch for Symfony2.0 compat

[lsmith77]

we should create a new branch from master for 2.0 compat using composer. not sure what to call it though.

[schmittjoh]

Don't we already have broken compat with 2.0, and a separate branch for it? Or what is the 2.0 branch good for?

[lsmith77]

yes .. this is currently handled by the 2.0 branch which however is out of sync. more importantly it doesn't follow the conventions we defined here https://github.com/FriendsOfSymfony/friendsofsymfony.github.com/issues/27

[schmittjoh]

I remember that discussion, but was a decision taken on which way to go? I'm at least not aware of what conventions we do have.

More importantly, I think we cannot branch from master anymore since BC has already been broken, or someone would have to revert some of the commits after branching to make it compatible with 2.0 again.

[lsmith77]

yeah .. this is what i did for FOSRestBundle .. aka reverting the relevant changes when i created the new branch

[stof]

reverting does not seem clean to me. If we decide to use a merge workflow, the outdated branch could be an issue. If we cherry-pick, it will work (we simply need to cherry-pick the relevant commits)

However, one thing is sure: we need to rename the branch to use a version number of the bundle.

[lsmith77]

i think reverting is cleaner .. but if you guys prefer we can also merge master into 2.0

[schmittjoh]

Reverting is the same like cherry-picking to me. I'd prefer that.

On Fri, Mar 16, 2012 at 7:56 PM, Lukas Kahwe Smith < reply@reply.github.com

wrote:

i think reverting is cleaner .. but if you guys prefer we can also merge master into 2.0

---

Reply to this email directly or view it on GitHub:

https://github.com/FriendsOfSymfony/FOSFacebookBundle/issues/130#issuecomment-4551260