Hi Peter, On Mon, Apr 15, 2024 at 02:28:18PM +0200, Petter Reinholdtsen wrote: > Dear package maintainer of git-buildpackage, > > Do you have an idea when you will find time to look at this patch?
Sorry, I assumed that it was meant to show the intended result not as an actual patch proposal (as it doesn't use any of the methods provided by gbp but shells out via popen). (It *is* helpful to demo the desired outcome, thanks Gioele). So is the intended flow to - import the new upstream version - fake merge that into the packaging branch (using the "replace" mode to avoid any conflicts (e.g. if the upstream source contain a debian/ dir) - apply the new debian/ on or debian diff on top? If so a patch that reuses the corresponding bits from import-orig (plus adjusting the test to verify it) would be very welcome. Cheers, -- Guido > [Gioele Barabucci 2024-08-19] > > The attached new patch, although still "quick and dirty", improves the > > handing of possible modification+deletion conflicts that may arise while > > merging the the upstream branch into the Debian branch. > > -- > Happy hacking > Petter Reinholdtsen >
