789
edits
m (Robot: Cosmetic changes) |
(→Repositories and Branches: The master and maint branches have long since ceased to be updated in the public repository.) |
||
Line 22: | Line 22: | ||
For historical reasons there continue to be separate repositories for SimGear and FlightGear source. There are 3 interesting branches in the repositories. Listed in order from least stable to most: | For historical reasons there continue to be separate repositories for SimGear and FlightGear source. There are 3 interesting branches in the repositories. Listed in order from least stable to most: | ||
* <tt>next</tt> The current tip of new development. This branch should always compile and run, but various things could be broken. | * <tt>next</tt> The current tip of new development. This branch should always compile and run, but various things could be broken. | ||
The following two branches are as of now (May 2011) very much out of date. '''Do not use'''. | |||
* <tt>master</tt> The tip of stable, tested new features. If we were to make a new release today, we would start from the tip of this branch. New features that have been "cooking" in the <tt>next</tt> branch for a few days or weeks will be merged here. | * <tt>master</tt> The tip of stable, tested new features. If we were to make a new release today, we would start from the tip of this branch. New features that have been "cooking" in the <tt>next</tt> branch for a few days or weeks will be merged here. | ||
* <tt>maint</tt> Bug fixes for the most recently released Flightgear. When a release is made from <tt>master</tt>, this branch is reset to it. | * <tt>maint</tt> Bug fixes for the most recently released Flightgear. When a release is made from <tt>master</tt>, this branch is reset to it. | ||
Line 27: | Line 28: | ||
This arrangement follows the scheme used by the Git maintainers. | This arrangement follows the scheme used by the Git maintainers. | ||
[http://www.kernel.org/pub/software/scm/git/docs/howto/maintain-git.txt This description] is very technical; you will surely have achieved git-fu if completely understand it. However, the idea of maintaining several branches of different stability is common in collaborative software projects. | [http://www.kernel.org/pub/software/scm/git/docs/howto/maintain-git.txt This description] is very technical; you will surely have achieved git-fu if completely understand it. However, the idea of maintaining several branches of different stability is common in collaborative software projects. | ||
== Clone and handle Repositories == | == Clone and handle Repositories == |
edits