9
edits
FlightGear Git: Difference between revisions
Jump to navigation
Jump to search
no edit summary
(New page: The Flightgear project has been experimenting with the [http://git-scm.com Git] distributed version control system as a replacement for CVS. == Git Flightgear Quickstart == The Git reposi...) |
No edit summary |
||
| Line 22: | Line 22: | ||
== Flightgear and Git == | == Flightgear and Git == | ||
The repositories at <tt>repo.or.cz</tt> are | The repositories at <tt>repo.or.cz</tt> are experimental, but when we do switch to Git the real repositories will be set up similarly. For historical reasons there continue to be separate repositories for Simgear and Flightgear. 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. | ||
* <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. | ||
| Line 34: | Line 34: | ||
should return nothing. The only commits that don't exist in CVS are those that set the version numbers of the maintenance releases because the maintenance releases don't exist as such in CVS. | should return nothing. The only commits that don't exist in CVS are those that set the version numbers of the maintenance releases because the maintenance releases don't exist as such in CVS. | ||
Even though the contents of <tt>next</tt> are the same as CVS HEAD, it | Even though the contents of <tt>next</tt> are the same as CVS HEAD, its history is different. It includes many merges from <tt>maint</tt> and branches based on <tt>maint</tt>. This makes it easier to move new work from <tt>next</tt> back to <tt>master</tt> and <tt>maint</tt> after it has had time to cook. | ||
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. | |||
== Git Tutorials and Resources == | == Git Tutorials and Resources == | ||
* Git [http://git-scm.com/documentation documentation and tutorials] | |||
* Git as a [http://tomayko.com/topics/git way of life]. | |||
* [http://wiki.github.com/bogolisk/egg Egg], a cool Git emacs mode. | |||