• Ubuntu branches on salsa

    From Iain Lane@21:1/5 to All on Wed Jun 12 11:40:02 2019
    Hi there,

    This is something we've talked about in the Ubuntu team, and I've been
    meaning to bring it up with pkg-gnome for a while but kept delaying. I'm wearing both my Debian and Ubuntu hats here.

    When we switched to git in pkg-gnome, Ubuntu also followed suit. On the
    Ubuntu side we've been pushing to Launchpad. By and large (IMO) it's
    been positive - our packages are derived from Debian's and this makes it
    much easier to maintain the delta. But there are some warts that can
    make it difficult to work with, particularly for new and drive-by
    contributors and people who don't yet have a good mental model of how
    git and gbp work. I'll not go into all the details, but the main one is
    that the 'upstream' and 'pristine-tar' branches get really difficult to
    handle if they are out of sync downstream - when we want to take a
    release ahead of Debian or if we're occasionally on a different series,
    for example.

    My proposal is to allow Ubuntu (no reason that other downstreams
    couldn't do this if they were in a similar position too) branches to be
    pushed to the repositories on salsa. This would require that we add
    members of the Ubuntu team to the group. On the Ubuntu side we'll take responsibility for educating our developers to avoid disrupting Debian's
    work. I think it'd be possible to arrange the permissions so that they
    can't push to 'debian/*' (make those maintainer-only, and only grant
    Ubuntu people the developer permission), but I hope we could try without
    doing that initially.

    I believe that the MySQL / mariadb team does something like this:

    https://salsa.debian.org/mariadb-team/mysql (look at the branches)

    Thoughts / objections / non-objections?

    Cheers,

    --
    Iain Lane [ iain@orangesquash.org.uk ]
    Debian Developer [ laney@debian.org ]
    Ubuntu Developer [ laney@ubuntu.com ]

    -----BEGIN PGP SIGNATURE-----

    iQIzBAEBCgAdFiEEPQ77lee1I38W6CJY41LVxRxQQdQFAl0AxjwACgkQ41LVxRxQ QdQCmBAAsxcE2uDtCOhrLboZY376HHwTbwYOqMZRHxF9T4mZ0swcPN/JjKKhvFVB 3VZjkAFfkdgqakO5j+Q/23bg13CRj8hz69rJ+m4aCL1muf/H4unesuSav8Bxyajy HKa+TX8k3hkyfBifvhny8oWEkCC2+RcQq4z77Px+D110LAVQF2NCOwW7HrO/t8VI EryOoStu4vJykz/91gaXE5l4SscP15xTA7GG8IsargE+CaM2rLdqz5vJMGmI+E9F B3rvP2kEa0a4p1trmDbTiY8q9IHregBjGz46OLuRlLJZBTQh1HzS0lqDUQdKPeC6 zYGWULey/AQ+geAPDBkbHJwmI/OybtkXYPnKPV7etCTkEPLNWkiUT810Xn7SVNrT ZqDYbBm2cH+3ZQRrFS4NOhg0v30f/4of+fb5mF2LY60vsjiXMcKgj11HO1VlUCvk V/4YG5ZAf7TRLo0OWVaTY+hB/8PcJEOvzmdigbSoXXM3hMFzz4A6of3Nmu89nRMW KbPk+ZJIr4cjZcB4JlCBtn4jXkV5B85TwZM5azHUXDZJMwzH4v9cHW5brvDqwoog PMDnylHXxX7Hbp97muZL+9N1Yug6fW1MXPjzoNq+k4q3ZAAE0oXOPtK/9QapF36l OxdenYGRKVC/O+5jQLunPDuY8TjXsoKmXOttYex
  • From Michael Biebl@21:1/5 to Iain Lane on Fri Jun 21 21:10:02 2019
    To: debian-gtk-gnome@lists.debian.org

    This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --bPtolNV8nZc5uRMymPRdvDYytaSVjsgg6
    Content-Type: text/plain; charset=windows-1252
    Content-Language: en-US
    Content-Transfer-Encoding: quoted-printable

    Hi Iain,

    Am 12.06.19 um 11:30 schrieb Iain Lane:
    Hi there,

    This is something we've talked about in the Ubuntu team, and I've been meaning to bring it up with pkg-gnome for a while but kept delaying. I'm wearing both my Debian and Ubuntu hats here.

    When we switched to git in pkg-gnome, Ubuntu also followed suit. On the Ubuntu side we've been pushing to Launchpad. By and large (IMO) it's
    been positive - our packages are derived from Debian's and this makes it
    much easier to maintain the delta. But there are some warts that can
    make it difficult to work with, particularly for new and drive-by contributors and people who don't yet have a good mental model of how
    git and gbp work. I'll not go into all the details, but the main one is
    that the 'upstream' and 'pristine-tar' branches get really difficult to handle if they are out of sync downstream - when we want to take a
    release ahead of Debian or if we're occasionally on a different series,
    for example.

    My proposal is to allow Ubuntu (no reason that other downstreams
    couldn't do this if they were in a similar position too) branches to be pushed to the repositories on salsa. This would require that we add
    members of the Ubuntu team to the group. On the Ubuntu side we'll take responsibility for educating our developers to avoid disrupting Debian's work. I think it'd be possible to arrange the permissions so that they
    can't push to 'debian/*' (make those maintainer-only, and only grant
    Ubuntu people the developer permission), but I hope we could try without doing that initially.

    I believe that the MySQL / mariadb team does something like this:

    https://salsa.debian.org/mariadb-team/mysql (look at the branches)

    Thoughts / objections / non-objections?


    I'm not really active anymore in pkg-gnome so take my feedback with a
    grain of salt, but what I would do is to pick a couple of packages (some
    trival ones (like games) and some more complicated, like glib), and just
    try for a while and then re-evaluate later.
    If there is a benefit for Debian to add those Ubuntu branches, then I
    don't see why it shouldn't be added.
    My point is that we probably can't tell without trying and we shouldn't
    be afraid to doing so.

    Michael





    --
    Why is it that all of the instruments seeking intelligent life in the
    universe are pointed away from Earth?


    --bPtolNV8nZc5uRMymPRdvDYytaSVjsgg6--

    -----BEGIN PGP SIGNATURE-----

    iQIzBAEBCAAdFiEECbOsLssWnJBDRcxUauHfDWCPItwFAl0NK1kACgkQauHfDWCP ItwWnxAAjKUS9eNp+vg8qwtHesitsI6QlfrR6MfyCeEWyDZalZkl1nD5aV2DJd4r Q5Z01jgIzxGE3DhKRCY8iLHYXGNPsdi3q566mTHJaHknUWPi6Mw65TZeWSzRCzUV b9KlNOFu2MLe332mOnT3EhZYUYxif7wkDKh91BWRWMKKjBIBT15C7qXWmQfi1zcL +WigY7QVTxdEgs9zUItC+Zk2CWY9wTeyJZzAsfsmcgzYDcX0rWwzWO/9OF8bHNj+ wlm50uuniRnGtse/dEP314k62SjzDBZaCWIBzkFrvZsd6UFngaAvs0hg/3rhGq8r XId7P7/W/LvoWkxK96WWnTUtW9O95/dGeMEws36F6YuchTqfTDKKBANi7H2yi1tY kvtpE66vS6kY0uSROi/6/9cBlyk7xZQLFHsYTsC+PS8/LzGXh9qyYTrVt+krXfJ5 lMiOu2fe5HZqvifUK+UGZRClWprdTA2AEKvb4HzCA1gSZKz/ZjGbwW+0JPMnR8yv dj8sd+YVVRZLizplt8PXFSQcnYM3Ba2+GiLii9AzQUx5K6SAGNOSfe0NxgCKlI2Z 6L6SDj2MmL5TW43rRh6NFz2N+G+lhk6oTx3yS6NlXjTqqzzMpeJ1ojJN/85/V5bo 2ofwC5BoBl+acOsiWlScZCMfrQy1wnvfe8EWaBB5XAoqlCW7wVU=
    =+SGY
    -----END PGP SIGNATURE-----

    --- SoupGate-