Re: About your live-build contributions
On Thu, 2020-03-05 at 10:55 +0100, Raphael Hertzog wrote:
> > I'll also just take this opportunity of mentioning that part of
> > that
> > page to point out that: it mentions "If you would like to be more
> > involved in the development of Debian Live packages, please join
> > the
> > Salsa group." With a link to the group page; I looked to see if
> > there
> > was some way to join out of curiosity, especially when the
> > following
> > sentence states that "All members of the Salsa group have commit
> > access
> > to our git repositories", but found none. Perhaps it was written
> > for
> > people who are already DDs/DMs and needs clarifying...?
> >
> > [1]: https://wiki.debian.org/DebianLive
>
> To be clear, I don't feel like being the Debian Live maintainer (even
> though in practice, I'm doing some of that job with a few others DD),
> I'm
> an active user as part of my work in Kali, thus I'm trying to help
> along... but I'm not documenting much, I'm not reviewing old bugs on
> a
> regular basis, etc.
Okay.
Yeah I felt I recognised you as being someone who'd been active on
debian-live back in the 2015 days and recalled a connection to kali.
I don't know how you'd perhaps feel about the idea of adding me to the
team such that I'd have the privilege of pushing at least the most
minor of changes directly without creating burden on yourselves?
> Feel free to step in and update the wiki page, etc.
I just took a look but could not create an account to do so with some
sort of anti-spammer error directing me to contact wiki@debian.org with
a description of my intentions, which I've now done... :/
> > Does this tool in fact work with "(Closes[:] #XXXXXX)" format?
> > Can multiple bug numbers be given in one go?
>
> I guess so but I have not double checked. It's usually best to fix a
> single bug in a single commit.
Ok.
Right yes, that might have been a lingering thought of the idea of them
possibly being needed in the MRs. Sorry, please ignore.
> > FYI, before taking a look at the referenced tool, I was not clear
> > from
> > your comment whether you actually meant that you wanted such hints
> > to
> > be present in the MR descriptions for tooling to pick up or in
> > commit
> > logs, so I updated the MRs accordingly. I later after looking at
> > the
> > man page for the tool you mentioned understood that it was likely
> > the
> > commit logs. I'm just mentioning this so that you know why I made
> > such
> > changes to the MRs.
>
> Given that we merge fast-forward branches without adding any merge
> commit,
> the bug closure needs to be in the commit themselves, not in the
> merge
> request.
Ack.
> Maybe we should revisit that decision of using only fast-forward
> merges, I
> don't use it on my other projects.
Hmm. Personally I have a disliking for merge commits. Sometimes they
can be helpful I guess but I feel like they get overused especially
with just pulling small contributions since it can make a horrendous
mess of things trying to view the history of a repo. I don't typically
find it helpful to have all sorts of merge branches flying off here and
there that are really just pointless development artifacts, compared to
a clear flat sequential list of commits.
> > > 4/ you should leave write access to the live-build committers
> > > when
> > > you
> > > submit your merge requests so that we can trigger the rebase on
> > > our
> > > side
> > > and/or append commits on our own
> >
> > Okay. I tried searching for the group to give it access, but could
> > not
> > get it to find the group. I successfully added the three group
> > owners
> > as devs though, so, not being very familiar with this side of
> > things, I
> > hope that's correct for what you need. :)
>
> Yeah, I can trigger the rebase now. Though I was referring to this
> feature when you submit the MR:
> https://salsa.debian.org/help/user/project/merge_requests/allow_collaboration.md
Great :)
I'll take a look at that in a bit.
> > > I merged the first MR and I'm already stuck because the others
> > > are
> > > obviously not a fast-forward and I can't rebase them from the web
> > > interface.
> > > https://salsa.debian.org/live-team/live-build/-/merge_requests/34
> >
> > hmm. I was not expecting such an issue. hopefully giving you the
> > above
> > access rights to my salsa copy of the codebase addresses this?
>
> Yes, it does.
>
> > to be clear, if I've found a bug and have made a patch, your
> > preference
> > is for only one or the other not both and it would be an annoyance
> > to
> > create both?
>
> It's a minor annoyance for me and a huge pain for you to properly
> cross-reference both of them. A bug report can be useful if you want
> to discuss something before creating a patch. If you're ready to
> submit a
> patch, then the MR is sufficient to discuss your patch.
Ok. Ack.
> > btw, the old 'tmp-jnqnfe' branch of mine on the official repo now
> > that
> > I look at it again only has a tiny proportion of my old work, some
> > of
> > which has been merged since its creation, and the rest is obsoleted
> > by
> > the new submissions, so that entire branch could be removed.
>
> Dropped.
Thanks.
> Cheers,
Thanks for your work on merging things :)
Now that a fellow maintainer has cleared the final few MRs I've
submitted a few fresh ones building on what's been accomplished so far.
we've a very good way through what I'd finished preparing so far.
Again, no rush though. :)
Reply to: