On Thu, Feb 12, 2026 at 03:11:17PM +0000, Ian Jackson wrote: > > I'm not sure I understand your git workflow. You say you're using > patches-applied. I assume that means you're using "3.0 (quilt)". > Reading between the lines, Ithink yuu probably aren't basing your > approach on any of the workflow recommendations in dgit-maint-*(7). > That's fine, and dgit may well be able to work with your git branch, > but it does mean I don't know what's going on.
I *think* I am using the procedures docuimented in dgit-maint-gbp. But it appears that gbp and patches-applied has some potential challenges where the safety checks trying to make sure that the patches that were cherry picked and the patches in debian/patches are consistent fail. The problem seems to be that dgit gets confused about what the base commit that should be used for its git diff, and so it refuses to do the dgit push. But I *know* that it's consistent, and it's at that point that I say, f*ck dgit, and just do a manual upload. > How are you keeping the upstream files in the main part of your git > tree in sync with the debian/patches/ ? Typically with > patches-applied and "3.0 (quilt)" one needs a tool to do this > (git-debrebase, git-dpm, git-debcherry). I do a git cherry pick, and then manually do a "git am -o debian/patches" and then edit the resulting file to meet the DEP-3 standards. See my branches at debian/backports and debian/master at the e2fsprogs git tree at https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git or https://github.com/tytso/e2fsprogs.git By the way, do you have a reference to git-debcherry? If that's something that automate creating a DEP-3 complaint patch file from the git cherry-pick that would save me a bit of time for each patch. > Certainly I think cherry-picking a patch from upstream, or writing a > fresh patch on an interim basis, is a routine operation that ought to > be straightforward. Agreed. > Can you point me to an example DEP-14 tag of an upload where you fell > back to dput? Examining the state in git might enlighten me. See the debian/backports branch. I just use "git-buildpackage" followed by a dupload on that branch. > The only thing it insists on is that your git and your .dsc > correspond; that's the property that enables it to be a bidirectional > gateway. That's also the property that means you can look only at > your git and then be confident that "dgit push" will DTRT without > needing to examine source packages, run debdiff on dscs, etc. That's the check which it is failing. Since *I* can recreate the packages using gbp, and the branch that I use is published on git.kernel.org and github.com, whether or not dgit thinks it's possible.... isn't worth my trying to figure out how to make dgit happy. - Ted
