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 salsa
  2. rename branch "upstream" → "upstream/latest" on salsa (or delete it)

rename branch in salsa would be very handy, i searched for it when i converted some repositories but i didn't find it, can you tell me how to do it please?

converting "upstream" branch to "upstream/latest" has always given me problems and wasted more time, that would take away one problem.

another problem seems to be if I had an "upstream" origin (which I use to cherry-pick upstream patches when needed), since then I put the upstream origin in the local repositories as "upstream_repo" to avoid problems.

I think for DEP-14 it would be very useful to have a howto for the conversion and a list of useful tips to avoid possible problems

  3. rename branch "upstream" → "upstream/latest" locally
  4. push local changes to salsa

(strictly speaking you can do step 3 before 1-2)


Additionally, in my opinion debian/latest is a mistake we should not
recommend.
Please elaborate why you consider it a mistake.  That's not obvious to
me.



  - Jonas


Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to