Hello both, If Dmitry wants to continue to use dgit-maint-merge(7), using 3.0 (quilt) will not help. It will not introduce any additional metadata. The only change will be the addition of a patch header pointing to dgit-repos.
Switching to dgit-maint-gbp(7) means using a patches-unapplied workflow. I assume Dmitry does not actually want to do that, but if he does, he should be able to do this: - `git revert` all commits to the upstream source - `gbp pq import` - `git cherry-pick` commits to the upstream source - `gbp export` - commit the new d/patches directory Now `dgit quilt-fixup` should succeed. Let me know if it doesn't. There is, however, a third option. In the next month or so we (Ian Jackson and I) will be releasing a workflow called dgit-maint-debrebase(7) which - is patches-applied; but - automatically generates a perfect 3.0 (quilt) representation of the Debian changes. I.e. it should satisfy everyone. Since we have submitted two sessions to DebConf18 about this new workflow, you can be confident the release will come before August :) So what I would like to suggest is that both of you hang tight for now and then evaluate this new workflow. inotify-tools can just stay how it is until then. -- Sean Whitton
signature.asc
Description: PGP signature
