[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: ruby-jekill-*: switching from overlay mode to standard ruby team workflow?



On 02/08/25 at 17:22 +0200, Daniel Leidert wrote:
> Hi,
> 
> On Sat, 2025-08-02 at 14:47 +0200, Lucas Nussbaum wrote:
> > 
> > Using UDD's Salsa Dashboard[1], I tried to identify packages that
> > have a non-standard status.
> > 
> > The following packages:
> > ruby-jekyll-archives
> > ruby-jekyll-compose
> > ruby-jekyll-default-layout
> > ruby-jekyll-mentions
> > ruby-jekyll-multiple-languages
> > ruby-jekyll-optional-front-matter
> > ruby-jekyll-redirect-from
> > ruby-jekyll-sitemap
> > ruby-jekyll-titles-from-headings
> > 
> > ... use gbp's overlay mode (only the debian/ dir is stored in git).
> > They were all uploaded by Daniel Leidert (Cced) around 2019-2020.
> > Daniel, would you agree for them to be moved to the standard team
> > workflow, using pristine-tar?  I can do the work.
> 
> Please proceed.

Thanks. I forced-pushed an history generated by `gbp import-dscs
--debsnap`, and preserved the previous branches and tags by renaming
them with a "backup/" prefix. This looked like:

# first, save all old branches/tags with backup/ prefix
../git-backup-branches-tags

# in a temporary directory, re-create a git history
git import-dscs --debsnap ruby-parse-cron
gbp push git@salsa.debian.org:ruby-team/ruby-parse-cron.git
# for e.g. ruby-jekyll-archives, use the web UI to change gitlab default branch,
# and to delete the previous default branch
# for e.g. ruby-parse-cron, git push -f since we are overriding the default branch
git push --set-upstream git@salsa.debian.org:ruby-team/ruby-parse-cron.git master -f

# re-checkout the git tree
rm -rf ruby-parse-cron; ./checkout ruby-parse-cron
# re-apply old commits since last upload
git cherry-pick  backup/NEW/0.1.4-1..origin/backup/master && git push

# manually fix debian/gbp.conf

> FWIW: I remember that there are multiple packages in the group that use
> upstream git as upstream (IIRC by the same uploader who I canot
> remember). So, there are more packages that do not follow our usual
> approach.

I could not find them (yet), but maybe I haven't looked hard enough.

ucas

Attachment: signature.asc
Description: PGP signature


Reply to: