From 2e00efa47135a5bd2e8f114a97b9339647253a34 Mon Sep 17 00:00:00 2001 From: Toni Uebernickel Date: Tue, 24 Apr 2012 00:03:22 +0200 Subject: [PATCH] add information on the branching model --- README.markdown | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index f6f3f2b..a39cb38 100644 --- a/README.markdown +++ b/README.markdown @@ -5,7 +5,24 @@ PropelBundle This is the official implementation of [Propel](http://www.propelorm.org/) in Symfony2. -Currently supports: +## Branching model + +As `Propel2` will be released in the near future, we are migrating the branching model of this bundle in advance! + +* The `1.0` branch will contain Propel *1.6* integration for Symfony *2.0* (*currently 2.0 branch*). +* The `1.1` branch will contain Propel *1.6* integration for Symfony *2.1* (*currently master branch*). +* The `2.0` branch will contain `Propel2` integration for Symfony *2.1*. + We are still considering to integrate `Propel2` with Symfony *2.0*. + In case, we will do so, there will be a `2.1` and `2.0` branch integrating the respective Symfony version! + +**The 1.x branches are already available and you are encouraged to migrate your dependencies according to the listings!** + +* If you depend on the `master` branch, switch to the `1.1` branch. +* If you depend on the `2.0` branch, switch to the `1.0` branch. + +We will keep all branches in sync until `Propel2` will be released. + +## Features * Generation of model classes based on an XML schema (not YAML) placed under `BundleName/Resources/*schema.xml`. * Insertion of SQL statements.