Difference between revisions of "RepositoryStructure"
m |
|||
| Line 3: | Line 3: | ||
== Stable Releases == | == Stable Releases == | ||
These are the branches that are considered stable and ok to be used by everyone. | These are the branches that are considered stable and ok to be used by everyone. Stabilization branches get odd numbers, as soon as they are release and even number. | ||
* | * v3.2 (campaign2010) | ||
* | * v3.8 (campaign2011) | ||
* | * v4.0 | ||
If you clone the repository directly from GitHub the newest stable release will end up in your working directory. | If you clone the repository directly from GitHub the newest stable release will end up in your working directory. | ||
Revision as of 07:01, 26 April 2012
Repository Structure Refers to the way Paparazzi is naming the branches and which one is the right one for you.
Stable Releases
These are the branches that are considered stable and ok to be used by everyone. Stabilization branches get odd numbers, as soon as they are release and even number.
- v3.2 (campaign2010)
- v3.8 (campaign2011)
- v4.0
If you clone the repository directly from GitHub the newest stable release will end up in your working directory.
The only commits that go into those branches are only bugfixes. No new feature commits are being done directly to those.
Development branch
The development branch is always called "dev". This is the branch where new features are being injected from the feature branches
Bugfix branches
If there are bugfixes to certain stable branches that need to be tested before they get merged into stable they get their own branches of the structure: "p<nr>fix_<description>". For example:
- p3fix_b2_v12_mag_signs
Feature branches
If a new feature is being implemented and is meant for people to test the "dev" branch is being copied into "feature_<description>" and after the implementation of the new feature is completed those branches get merged with "dev" again. For example these branches could have names like:
- feature_state_interface
- feature_luftboot_support
- feature_spi_queues
Old VS new repository structure
This section describes how the old structure will be changed to the new structure. These are the intended branch renames and actions as of 2012/April/25
- rename: master -> paparazzi3
- Two options here
- rename: 4.0_beta -> paparazzi4 and delete: dev
- rename: dev -> paparazzi4 and delete: 4.0_beta
- merge: dev_i2c -> paparazzi4
- rename: locm3 -> dev
- rename: spi_driver -> feature_spi_driver
- rename: campaign2010 -> paparazzi1
- rename: campaign2011 -> paparazzi2
- rename: b2_v12_mag_signs -> p3_fix_b2_v12_mag_signs
- rename: quadshot_integration -> feature_transitioning_aircraft_support
- rename: new-state-interface -> feature_new-state-interface