3,267
edits
Changes
Jump to navigation
Jump to search
Line 157:
Line 157: − + − + − + Line 171:
Line 171: − +
→Branching: new release numbers
After the final release of a module, a branch should be created to host further stable development. Please use a name in the form: sucrose-XXX (for example sucrose-0.84). Each module maintainer is responsible to inform the [http://lists.sugarlabs.org/listinfo/sugar-devel sugar-devel@lists.sugarlabs.org] and [http://lists.laptop.org/mailman/listinfo/localization localization@lists.laptop.org] lists about the branch.
After the final release of a module, a branch should be created to host further stable development. Please use a name in the form: sucrose-XXX (for example sucrose-0.84). Each module maintainer is responsible to inform the [http://lists.sugarlabs.org/listinfo/sugar-devel sugar-devel@lists.sugarlabs.org] and [http://lists.laptop.org/mailman/listinfo/localization localization@lists.laptop.org] lists about the branch.
A new branch is created on the Pootle server, e.g., Fructose-0.82 and Fructose-0.84. The Localization team (the coordinator of a translation team) may push translations to any or all of the corresponding branches of your project. Changes to your master branch are not necessarily intended for the release branches as well.
A new branch is created on the Pootle server, e.g., Fructose-0.96 and Fructose-0.98. The Localization team (the coordinator of a translation team) may push translations to any or all of the corresponding branches of your project. Changes to your master branch are not necessarily intended for the release branches as well.
You can create a remote branch like this (in your repository):
You can create a remote branch like this (in your repository):
git branch sucrose-0.84
git branch sucrose-0.98
git push origin sucrose-0.84
git push origin sucrose-0.98
You can as well branch off at a specific commit:
You can as well branch off at a specific commit:
And to work on it (in your repository):
And to work on it (in your repository):
git checkout -b sucrose-0.84 origin/sucrose-0.84
git checkout -b sucrose-0.98 origin/sucrose-0.98
git pull
git pull