392
edits
FlightGear Git: Difference between revisions
Jump to navigation
Jump to search
m
Repositories and Branches
(→Repositories and Branches: The master and maint branches have long since ceased to be updated in the public repository.) |
m (Repositories and Branches) |
||
| Line 20: | Line 20: | ||
== Repositories and Branches == | == Repositories and Branches == | ||
For historical reasons there continue to be separate repositories for SimGear and FlightGear source. | For historical reasons there continue to be separate repositories for SimGear and FlightGear '''source'''. For most users and developers the most interesting ones of each are: | ||
* <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>release/*</tt> The branch subdirectory containing former and, if there is one, upcoming releases. | ||
For other available branches have a look at our [http://gitorious.org/fg/flightgear#more repository] at gitorious.org. 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. | ||
FlightGear '''data''''s branches of interest are: | |||
* <tt>master</tt> The one that is used with the <tt>next</tt> branch of the source. | |||
* <tt>release/*</tt> Same as for the source. | |||
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 == | ||
| Line 36: | Line 45: | ||
# Cloning FGData | # Cloning FGData | ||
By default you will be checking out the <tt>next</tt> branch of SimGear and FlightGear. This is probably what you want if you want to assist with reporting bugs and the like before they are release as a proper release version. | By default you will be checking out the <tt>next</tt> branch of SimGear and FlightGear and the <tt>master</tt> branch of FGData. This is probably what you want if you want to assist with reporting bugs and the like before they are release as a proper release version. | ||