In #829444 it has been proposed the addition of a new "layout" option to gbp.conf, which would tell git-buildpackage which layout to follow, allowing for a graceful migration.
I've been thinking about a different approach though. What about adding
a warning to git-buildpackage when `debian-branch` and `upstream-branch` are not set in gbp.conf? Compared to the `layout` option, it would have
the following benefits:
...
How does it sound to you? Am I missing something?
I prefer having no debian/gbp.conf at all in case the repository layout
would fit team policy. So the question is whether git-buildpackage can
cope with the old
master + upstream + pristine-tar
as well as
debian/latest + upstream/latest + pristine-tar
if no gbp.conf exists.
considering that it makes sense to settle with DEP14[1] first before we
can decide about DEP18 I wonder what is finally needed to accept DEP14.
I think its cruxial to make git-buildpackage supporting DEP14 per
default[3] but I'm somehow sensing some hen-egg problem here what to do first. If DEP14 might be accepted the motivation to fix bug #829444
would be probably way higher.
I prefer having no debian/gbp.conf at all in case the repository
layout would fit team policy.
pristine-tar isn't the default either, so you need debian/gbp.conf if your team uses it.
Unless I've missed some recent changes.
pristine-tar isn't the default either, so you need debian/gbp.conf if your
team uses it.
That's correct but the teams I'm working in recommend something like:
Add the following to the configuration file ~/.gbp.conf or debian/gbp.conf:
Putting team-specific settings into the global ~/.gbp.conf is a bad idea
in my opinion, but also you can set DEP14 branches there in the same
way...
Am Fri, Aug 16, 2024 at 02:58:40PM +0500 schrieb Andrey Rakhmatullin:
pristine-tar isn't the default either, so you need debian/gbp.conf if your team uses it.
That's correct but the teams I'm working in recommend something like:
Add the following to the configuration file ~/.gbp.conf or debian/gbp.conf:
So accepting DEP14 would mean a lot of work for me (at least[…]
testing the suggested scripting solutions[4] carefully)
Are there any blockers to accept this DEP which I might have missed?
[4] https://lists.debian.org/debian-devel/2020/09/msg00168.html
https://lists.debian.org/debian-devel/2020/09/msg00172.html
I tried to express: I'm more than willing to convert all packages where
I'm Uploader (most preferably) if DEP14 is accepted.
A couple of years ago I was thinking about implementing DEP-14 support
in gbp, [...]
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].
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.
Additionally, in my opinion debian/latest is a mistake we should not recommend.
That's correct but the teams I'm working in recommend something
like:
Add the following to the configuration file ~/.gbp.conf or
debian/gbp.conf:
Any ideas how we can come up with some suggestion that will finally
enable us with some common reopsitory layout that enables automated conversion from any existing layout. IMHO we should move DEP-14
forward since having it an open suggestion for ages will not bring
any progress.
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.
Additionally, in my opinion debian/latest is a mistake we should not recommend.
Thanks for bringing up this topic, I just wanted to share 8-year old
notes, when it was discussed the same topic and kind of acknowledged
at DebConf16:
- https://gobby.debian.org/export/debconf16/bof/gbp (entry https://gobby.debian.org/export/debconf16/bof/gbp)
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.
Additionally, in my opinion debian/latest is a mistake we should not recommend.
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:I have in the past found it confusing how to handle it, but now I find
IMO, and from discussions in the Debian Perl Group, the blocker isI want to echo this pain. When changing the layout it seems almost
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].
better to start from scratch.
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?
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)
3. rename branch "upstream" → "upstream/latest" locally
4. push local changes to salsa
Add the following to the configuration file ~/.gbp.conf or
debian/gbp.conf:
Putting per-repository relevant settings into a global config and
not into the per-repo config seems to fly into the face of the DEP18
spirit.
Maybe there is no issue with changing git-buildpackage after all
then.
On Sat, Aug 17, 2024 at 12:20:16PM +0200, Andreas Tille wrote:
My personal preference would be if we make a pristine-tar branch default
since this is what I observed in the wide majority of cases.
Note that there are different opionons whether pristine-tar is needed/viable/useful. There is at least one objective fact that it's hard
to keep working.
My personal preference would be if we make a pristine-tar branch default since this is what I observed in the wide majority of cases.
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.
"latest" is illnamed. What do you expect to find in a branch thats
called debian/latest?
Packaging for unstable? For experimental?
What if both evolve in parallel? Yes, some packages do that.
"latest" is illnamed. What do you expect to find in a branch thats
called debian/latest?
Packaging for unstable? For experimental? What if both evolve in
parallel? Yes, some packages do that.
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.
"latest" is illnamed.
What do you expect to find in a branch thats called debian/latest?
Packaging for unstable? For experimental? What if both evolve in
parallel? Yes, some packages do that.
Sysop: | Keyop |
---|---|
Location: | Huddersfield, West Yorkshire, UK |
Users: | 428 |
Nodes: | 16 (2 / 14) |
Uptime: | 107:21:37 |
Calls: | 9,053 |
Calls today: | 10 |
Files: | 13,395 |
Messages: | 6,015,726 |