Hi,
On Wed, Jan 21, 2026 at 09:44:17AM +0100, Sylvain Beucler wrote:
>
> Here it seems Anton forked the repository for LTS, but incorrectly created
> new 'upstream' and 'pristine-tar' branches instead of re-using the existing
> ones ('upstream/$dist'). We now have bullseye imports on 2 upstream
> branches.
>
> Then I guess Emilio didn't push the upstream/4.3.8 tag when importing
> 4.3.8-0, and also switched back to the original 'upstream/bullseye' branch,
> perhaps by starting his work on the original ffmpeg repo.
>
> Then Thorsten imported deb11u2.dsc, without noticing the missing tag,
> creating a separate identical import. (Then probably did multiple imports
> while finalizing the upload, and incorrectly dropping the new upstream tag
> each time.)
>
> Last, Adrian appears to have imported 4.3.9 manually, the merge commit
> doesn't point to a branch. But incorrectly, as even '/VERSION' is still at
> de-sync'd 4.3.8. This is what's causing the GBP build failure.
Nice analysis! It now makes more sense to me how this happened, though
the Version thing (maybe an incorrect merge conflict resolution) and the
various imports in the middle still are weird to me. Anyway, I don't
think spending time to understand them make much sense now.
> That's quite a lot of issues.
>
> Overall our repo is in quite a bad shape.
Yeah, I feel the same.
> I checked out https://salsa.debian.org/charles/ffmpeg.
>
> We're missing 'upstream/4.3.8' and 'debian/4.3.8*' tags.
I will check if I forgot to push or if the tags are really missing.
> We need to update 'pristine-tar' with the new 4.3.x upstream releases.
Ack, will do it with pristine-tar command.
> I'm in favor of force-pushing, as too many issues piled-up, and this is
> error-prone for future uploads.
Ack.
> We might want to completely ditch our repository and re-import debian/buster
> and debian/stretch as well, as they still point to Anton's separate
> 'upstream' and 'pristine-tar' branches.
I didn't spend to much time on those because they build from source, but
if they are as messy, yeah, I think it's worth a shot at re-importing
things. Though, we don't have something like snapshot.d.o for ELTS, so
if at some point an ELTS tag doesn't build from source, we might not be
able to regenerate the .dsc for re-importing it.
Thanks for taking the time to analyze and reply, Sylvain!
Cheers,
Charles
