Hi! So far the Debian packaging lives in bzr and I regularly merge from the apparmor-ubuntu-citrain branch. I want to move it to Git ASAP.
Does Ubuntu have a plan wrt. packaging src:apparmor in Git? If not, I will set something up. My preferred workflow is: - use git-buildpackage + pristine-tar - always pass --upstream-vcs-tag to `gbp import-orig', so that the upstream Git history is merged when importing the new release tarball - use `gbp pq' to manage the quilt patch series (but this is left to personal preferences as the patch-queue branch is never pushed, and debian/patches/ remains the common format used for sharing/storing the patch series in Git) This is the workflow we're using on the Debian Perl team to maintain 3k+ packages. I've also been using it on a number of other Debian packaging teams. It's not perfect but I've found it works better than anything else I've tried. But I will consider using another workflow if you folks prefer something else. Additionally, when maintaining packages for more than 1 distro at a time, I've had good experience with the http://dep.debian.net/deps/dep14/ branch & tag naming conventions. It would allow us to share a single packaging Git repo between Debian, Ubuntu, and other derivatives, if we want to. Thoughts? Wrt. the actual repository conversion: - I expect some trade-offs will be needed wrt. preserving history: AFAICT you folks have been merging *by hand* my work into the apparmor-ubuntu-citrain branch, so bzr is not aware of it, i.e. my commits don't appear anywhere in your branch. But I've been merging your branch into mine with bzr, so your commits do appear in my branch and the merges are encoded as such. In other words, my the history of my branch is a superset of yours. So I think I'll convert my own Vcs-Bzr to Git. - Suggestions and hints welcome as I've never done bzr→Git conversions. Steve, could you please share your scripts or notes? Cheers, -- intrigeri -- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
