Re: [bitbake-devel] [docs] [PATCH 1/2] bitbake-setup: rename "abort" rebase conflict stragegy to "halt"

Alexander Kanavin
2026-04-03T10:04:58Z

[-- Attachment #1: Type: text/plain, Size: 2543 bytes --]

The trouble with ‘reset’ is that it means resetting the whole system to its
initial state. ‘Abort’ is about a stopping a particular operation such that
the system is returned to the state before the operation started.

I have no idea how INI has utterly failed to catch these nuances in its
rationale you linked, and is even accusing the term of ‘lacking technical
clarity’, but it certainly doesn’t help the cause.

Alex

On Fri 3. Apr 2026 at 10.07, Antonin Godard via lists.yoctoproject.org
<antonin.godard=bootlin.com@lists.yoctoproject.org> wrote:

> On Tue Mar 31, 2026 at 1:36 PM CEST, Alexander Kanavin wrote:
> > There’s a simpler rationale too: this follows ‘git rebase —abort’. If git
> > upstream finds a better word, we will follow. And I agree that all of the
> > proposed alternatives are less accurate.
>
> This goes against previous efforts to convert the documentation and other
> components to not use these words :/
>
> https://lists.openembedded.org/g/openembedded-architecture/topic/inclusive_language_summary/75821819
>
> [...]
> >> > This is not what halt means. Maybe 'reset' would be a better choice?
> Or
> >> > if you really want to follow the recommendations from that website, I
> >> > guess "cancel"?
> >>
> >> The trouble is none of these alternatives really match what abort
> >> means, reset and cancel do mean something different. "abandon" might be
> >> closer but still isn't right. "attempt" maybe? If we get too creative
> >> with this, users just won't understand what it means :(
>
> I had the impression, from the documentation, that bitbake-setup would
> leave the
> repository in the middle of a rebase, to let you deal with conflict, and
> then
> continue on the next bitbake-setup update call.
>
> It appears to use --abort instead, so a misunderstanding from my part.
>
> Out of these options, I think "reset" might be the best one, I agree with
> Quentin. But I'm not a native speaker, so I might not have an
> understanding as
> subtle as others.
>
> I'll let Richard decide on what to do here.
>
> Antonin
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#9173):
> https://lists.yoctoproject.org/g/docs/message/9173
> Mute This Topic: https://lists.yoctoproject.org/mt/118594590/1686489
> Group Owner: docs+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/docs/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

[-- Attachment #2: Type: text/html, Size: 3859 bytes --]