Hi Samo, On Fri, Aug 09, 2024 at 08:53:25PM +0200, Samo Pogačnik wrote: > > I hope you are planning to address admorgan's comments on the upstream PR > > > > I prepared a modified upstream change regarding generation of test git repos > and > and potentially initializing the whole project as git project, according to > admorgan's comments. > > I have a question regarding how to proceed modifying upstream sources, where i > want to modify my existing patches with regard to the current state of the > package. > > For example i want to rewrite patches 0004 and 0005 according to upstream > request but i am not sure if this is the correct way to proceed.
On the Debian git side you just replace the d/patch/* files and commit that change. On Sun, Aug 11, 2024 at 09:50:05AM +0200, Samo Pogačnik wrote: > > Looking at what remains after `quilt pop -a` I see untracked files > > test/repo/* which you create with your 0005 patch. Really that should > > probably be in test/tmp which upstream has already setup to be removed by > > their clean target. > > > > Other than that I see changes to upstream files: > > > > [...] > > How do you run your build to get to this state? When i run 'gbp buildpackage' > from my local debian/sid branch, my git checkout stays intact. Are you using gbp-buildpackage with --git-builder=sbuild? sbuild is an out-of-tree build, to test cleaning you need an in-tree build. I do that with `debuild -uc -us; debuild -- clean`, possibly inside a sid schroot (not necessary for git-subrepo iirc). --Daniel
signature.asc
Description: PGP signature
