Hi, On Thu, Aug 28, 2025 at 11:37:32PM +0200, gregor herrmann wrote: > On Wed, 27 Aug 2025 11:15:45 +0200, Lucas Nussbaum wrote: > > > On 27/08/25 at 02:15 +0200, Johannes Schauer Marin Rodrigues wrote: > > > > the main script to migrate a given project to DEP-14 is > > > > https://salsa.debian.org/ruby-team/meta/-/blob/master/dep14-migrate?ref_type=heads > > > that sounds like a useful tool for devscripts, no? > > I thought about it but I'm not sure: at this point, I think it's useful > > as an example of how to perform such a migration in a large team, but it > > encodes some of the Ruby team's preferences. I would expect other teams > > to use it as a basis and adjust it to their own preferences, not to > > expect it to meet their needs as is. > > This looks very interesting indeed, and we will look at it for sure when > doing the conversion in the Perl team, which is on the agenda. Thanks for > writing and publishing this script. > > > Also dep12-migrate performs the actual migration, while > > dep-14-convert-git-branch-names.sh only suggests what should be done. > > That's indeed an advantage of your script :) > > > What's still missing is a solution for locally checked out clones on Other > People's Laptops, as git will blow up if the remote changes from "upstream" > to "upstream/latest" and they git-pull/gbp-pull/mr-up … > > Guido thankfully started to work on this during DebCamp, with the idea of > enhancing gbp-pull to catch this specific error and fix the branch: > https://salsa.debian.org/agx/git-buildpackage/-/merge_requests/53 > I suppose tests and other help would be appreciated here.
This doesn't happen anymore with git from forky and for older git the MR should do the trick. Cheers, -- Guido > > > Cheers, > gregor > > -- > .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org > : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 > `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe > `-
