Il 18/08/2024 15:51, Fabio Fantoni ha scritto:
Il 17/08/2024 12:00, Jonas Smedegaard ha scritto:I tried using salsa cli tool from Gregor link but rename of upstream branch failed.Quoting Fabio Fantoni (2024-08-17 11:20:01)Il 17/08/2024 10:47, Jonas Smedegaard ha scritto:Hi Chris,Quoting Chris Hofstaedtler (2024-08-17 10:17:19)On Fri, 16 Aug 2024 23:36:31 +0200, gregor herrmann wrote:IMO, and from discussions in the Debian Perl Group, the blocker is the conversion of existing repos, both on salsa (which should be doable via the API as suggested in the sketches mentioned above) and also locally for hundreds of developer machines [git fails horribly on the upstream/ → upstream/latest change].I want to echo this pain. When changing the layout it seems almost better to start from scratch.I have in the past found it confusing how to handle it, but now I find it tolerable (and don't recognize the "better to start from scratch" judgement), after I figured out (as also hinted at in one of the links by gregor) that you need to do the following, in that order: 1. unlock branch "upstream" on salsa2. rename branch "upstream" → "upstream/latest" on salsa (or delete it)rename branch in salsa would be very handy, i searched for it when iconverted some repositories but i didn't find it, can you tell me how todo it please?I cannot (I sloppily drop the branch and the republish a moment later), but please see the links mentioned by Gregor. - JonasI did this trying on one project: salsa --group cinnamon-team protect_branch xapp master nosalsa --verbose --group cinnamon-team rename_branch xapp --source-branch=master --dest-branch=debian/latest # this failed to delete master, changed default branch from salsa website (in Settings->Repository) and deleted master branch (from website)salsa --group cinnamon-team protect_branch xapp debian/latest m d# after these the conversion from master to debian/latest seems correct, rename of upstream branch instead failssalsa --verbose --no-fail --group cinnamon-team rename_branch xapp --source-branch=upstream --dest-branch=upstream/latestsalsa info: cinnamon-team id is 2992 salsa info: Project xapp => cinnamon-team/xapp salsa info: cinnamon-team/xapp id is 17710 salsa info: Configuring xapp salsa warn: Branch rename has failed for xappsalsa info: Error POSTing https://salsa.debian.org/api/v4/projects/17710/repository/branches (HTTP 400): Bad Request {"message":"Failed to create branch 'upstream/late... at /usr/share/perl5/Devscripts/Salsa/rename_branch.pm line 26.Error above on Sid with devscripts 2.23.7 but I tried also on older systemSomeone had rename of upstream branch working?
fixed doing this workaround:salsa --verbose --no-fail --group cinnamon-team rename_branch xapp --source-branch=upstream --dest-branch=upstream-tmp
salsa --verbose --no-fail --group cinnamon-team rename_branch xapp --source-branch=upstream-tmp --dest-branch=upstream/latest
after saw this (https://gobby.debian.org/export/Teams/Perl/new-branch-layout) probably with --rename-head can avoid error on master delete and make the procedure faster (not tested now)
OpenPGP_signature.asc
Description: OpenPGP digital signature