Working with Git in Debian GNOME Team
This is currently just a draft of how we see us working with packaging in git in the future. One of the most important things for us in the team is to have a common workflow for all packages we maintain, so we try to discuss and create a focus point in this document. Feel free to add questions and suggestions.
Some basic issues where discussed during the sprint in Antwerpen and is described in the gnome section of the summary mail sent out by jordi:
We want to convert the entire svn history over to git and sjoerd has been working on making this possible, his work can be found in:
To be described once we have come further with asking and answering questions.
Questions and answers
- TODO: topic branches?
- Branch strategy?
- Use a version-specific upstream branch like upstream/3.20.x upstream/3.22.x etc and put a debian/gbp.conf to let git-buildpackage know which upstream branch is used in a given packaging branch.
- Optionally you can use upstream/latest for debian/master.
This is basically DEP-14 in action. You can see it in the python-django repository (modulo forced switch to git-dpm that we will revert). We also use it in the pkg-security team but we rarely need to manage multiple upstream versions in parallel.