Hello, On Wed 30 Oct 2024 at 01:24pm GMT, Otto Kekäläinen wrote:
> I can (and I did test already) do a merge with --allow-unrelated > histories, but dgit history always has patches applied as separate > commits that get rebased and thus there is no quilt/gbp pq -compatible > git history to merge from. If I later do a 'dgit --gbp push' to > upload, how do I push a development version to Salsa for review and CI > testing? If the NMU was done with dgit, then dgit only appends commits to apply the patches. Thus if you look a few commits back in history, you'll find something you can merge. > Based on docs and your previous replies it isn't possible, thus `gbp > import-dsc --verbose --pristine-tar apt:j4-dmenu-desktop/sid` still > seems to stand as the optimal way to import NMUs onto a Debian > packaging git repo? If the upload was not done with dgit, then probably, yes. > The man pages of dgit are extensive and explains well how to interact > with the Debian repository as if it was a git repository, but I am > unable to find descriptions of how to use dgit in team maintained > packages with testing and reviews prior to uploads. The idea is that dgit is only needed when dealing with source packages. When collaborating with team members prior to upload, you don't really need any source packages -- you just build straight out of git. If you can identify a place in the docs where some reference to this could be added that would have been helpful to you, a patch would be very welcome. -- Sean Whitton
signature.asc
Description: PGP signature
