[Pkg-samba-maint] Yesterday mishap with bookworm commits

Michael Tokarev mjt at tls.msk.ru
Fri Jul 7 07:33:11 BST 2023


Hi!

Yesterday I had to roll back a few branches in the samba repository on salsa.d.o,
after realizing I've made a mistake when publishing a new upstream version for
debian bookworm.

The prob was an incomplete change which removed *some* of the auto-generated
manpages, which I cherry-picked from unstable - which affected +dfsg.orig.tar.gz
archive generation, resulting in half-broken archive.  This is not just a single
branch but a bunch of branches (bookworm, upstream_4.17 and pristine-tar) and a
tag (upstream/4.17.9+dfsg).

There was 2 choices here: either push another source (4.17.9+dfsg2 ?) or reset to
version before this damage.  Reverting doesn't work well across merges.

Since this is for bookworm stable-proposed-updates, and I refer to the list of
changes in the unblock request, making it messy doesn't help.  At the same time,
new gitlab UI on salsa.d.o makes it really easy to force-push to a branch, which
was really new to me, - I didn't expect it to be this easy.

So I decided to fix this mess by resetting to the state which was here an hour
before, to a non-broken state which correspond to the actual debian packaging,
and start over.

I hate it when it happens, it's the first time I made such a mishap (affecting
several closely related intermixed branches). Maybe that was a bad solution and
a better solution exists which I didn't think about. But this is how it is.

Please accept my apologies for this situation.

/mjt



More information about the Pkg-samba-maint mailing list