10,505
edits
Changes
Jump to navigation
Jump to search
Line 207:
Line 207: + + + + + + + + + + + + + + + + +
→Versioning
To minimise the maintainer overload we highly encourage you to only do bug-fix releases for the GTK2 branch. New features should only go into the new branch that is based on gobject-introspection and GTK3.
To minimise the maintainer overload we highly encourage you to only do bug-fix releases for the GTK2 branch. New features should only go into the new branch that is based on gobject-introspection and GTK3.
Note that some older versions of Sugar don't know how to parse dotted version numbers. An alternative to the above is to simply ensure that the version number of the GTK3 branch is always greater than (>) the version number of the GTK2 version.
===GIT conventions===
We've agreed that the GTK3 version should be in the '''master''' branch on gitorious.sugarlabs.org. The GTK2 version should be in a branch called '''gtk2'''.
Some helpful git foo:
From your repository, first create the GTK2 branch with:
git branch gtk2
Then pull in all GTK3 changes on top of the master branch:
git pull git://path/to/gtk3/repo
To move the gtk2 to gitorious.sugarlabs.org:
git checkout gtk2
git push -u origin gtk2
== Tips to Activity Developers ==
== Tips to Activity Developers ==