Re: Most optimal way to import NMU into existing git-builpackage repository?

[Sean Whitton <spwhitton@spwhitton.name>]

Hello,

On Thu 24 Oct 2024 at 09:36pm +01, Otto Kekäläinen wrote:

> Hi,
>
> I occasionally run into the situation that a package has been NMU'd or
> otherwise updated directly into the Debian repositories,
> bypassing/ignoring that a packaging git repository existed. I was
> wondering what techniques other DDs use to
> 1) detect that the git packaging repository was bypassed/diverged?

If you do all your uploads using 'dgit push', it will always detect this.

> 2) bring the git repository back in sync with minimal effort?

If you are using a patches-applied workflow or you have no patches,
'dgit pull' will do this.

If you are using patches-unapplied, you might be able to 'dgit fetch'
and then manually merge.

-- 
Sean Whitton