On Wed, 10 Aug 2016, Nikolaus Rath wrote: > I don't believe that switching from git-dpm to git-buildpackage is going > to make things easier, it'll just be trading one set of problems for > another.
I don't agree on this. I have been a happy git-buildpackage user for all my packages. The problem with git-dpm is that the patch series can't be easily fixed after a merge when it generates conflicts. It's too intricately tied to git-dpm's own fake merge logic with commit it recorded in debian/.git-dpm and it's very painful to bring the repository in a state where git-dpm is happy. With git-buildpackage, the merge and the update of the patch series are distinct operations that can be done at different times. Since patches are unapplied, the merge usually works fine and the patch series can be easily rebased afterwards with your tool of choice. Anyway, +1 from me to switch to git-buildpackage and in fact among the python-django maintainers we are close to decide to switch back to git-buildpackage because it's really horrible to use when you want to merge across branches of different releases. Cheers, -- Raphaël Hertzog ◈ Debian Developer Support Debian LTS: http://www.freexian.com/services/debian-lts.html Learn to master Debian: http://debian-handbook.info/get/
