Hi,
On Fri, Aug 3, 2018 at 10:44 PM Ian Jackson <[email protected]> wrote: > Control: tags -1 + moreinfo > > Hi again Felipe. I looked at this bug again and I have two questions > / requests for comment. > > > I think of the options enumerated in > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=865443#92 > I am inclined to do this: > > 4. dgit could automatically generate a quilt patch which deletes > > them and include it only in the dgit view. > (Note that this would remove them from the source package too.) > I think this is better than the alternative suggestion > > 5. dgit mimics dpkg-source and ignores deletions and thus adds the > > files back in the dgit view. > because these deleted files may be regenerated somehow by the > build, or, often, even updated, and having files in git modified > by the build is annoying. Having files not in git created by > the build is much less annoying for the user. > > What do you think ? > In my case, the removals were actually a bug. Therefore, I'm not so sure option 4 should happen silently, as I got a chance to fix the problem. Not only that, but then the series file would differ between the dgit view and the maintainer view: `gbp buildpackage -S` and `dgit build-source` would produce different results. > No matter what I implement I would want to verify with your actual > package that what I had done fixed your bug. Unfortunately I forgot > to ask you earlier for the relevant information. > > Can you point me to the relevant git HEAD ? I would need the repo to > clone from and the commit id you were using. (Or some other commitish > that has the same problem.) Sorry for not asking when you had all > this readily to hand. > The repo is https://salsa.debian.org/multimedia-team/csound.git , and a broken commit is: b95f238a3bc27b7c4ab66858ba0898c4ccca6e34 I want to note that on this commit, currently dgit says: dgit: error: --quilt=gbp specified, implying patches-unapplied git tree dgit: but git tree differs from orig in upstream files. dgit: For full diff showing the problem(s), type: dgit: git diff b8f8e91b20ed09dad30f2ab3d9af90d24e67ed97 HEAD -- :/ ':!debian' ':!/.gitignore' ':!*/.gitignore' This is quite an improvement since I first wrote to this bug. From my own POV, this new, readable message fixes the issue. > > I will also need the corresponding orig tarballs but I guess that they > will be readily available from the archive or from snapshot.d.o. > This package uses pristine-tar so you can just `origtargz --unpack=no`. -- Saludos, Felipe Sateler
