Re: Most optimal way to import NMU into existing git-builpackage repository?
Hello,
On Sun 27 Oct 2024 at 05:29pm GMT, Otto Kekäläinen wrote:
> Hi!
>
>> > Seems this is still the most optimal way to ensure git is correct:
>> >
>> > gbp import-dsc --verbose --pristine-tar apt:j4-dmenu-desktop/sid
>> >
>> > Also, dgit pull can be used to get the latest source automatically, but unfortunately those
>> > git commits are made as a custom "Debian as a git repo" representation, and is not
>> > compatible with using CI testing and code review before upload in the way many of us
>> > are doing on Salsa currently.
>>
>> 'dgit pull' integrates the NMU automatically, when it can. It doesn't
>> just fetch the source. I don't follow how it's different from 'gbp
>> import-dsc'. Could you say more?
>
> In a gbp checkout of git@salsa.debian.org:debian/j4-dmenu-desktop.git,
> how would you invoke 'dgit pull sid' to import the NMU?
>
> Without any parameters, it will create branch 'dgit/sid' which has
> unrelated history and patches are applied and nothing can be merged or
> cherry-picked to the git-buildpackage master branch. Perhaps I am just
> missing something on how this should work, or perhaps
> https://manpages.debian.org/unstable/dgit/dgit-maint-gbp.7.en.html#INCORPORATING_NMUS
> implies the functionality isn't yet there?
This is one of the cases where it can't do it completely automatically,
but a manual merge may be possible.
--
Sean Whitton
Reply to: