On Mon, Aug 12, 2024 at 3:54 AM Richard Purdie
<[email protected]> wrote:
>
> On Mon, 2024-08-12 at 16:32 +0800, Changqing Li wrote:
> > On 6/18/24 11:30, Changqing Li via lists.openembedded.org wrote:
> > > From: Changqing Li <[email protected]>
> > >
> > > With --force-overwrite (implied by --force-all), dpkg will not
> > > abort
> > > when a package overwrites files from different packages. As this
> > > can
> > > also lead to "The following package disappeared from your system as
> > > all files have been overwritten by other packages: <package>" and
> > > subsequently broken dependencies, this makes the simple case of
> > > conflicting files hard to debug.
> > >
> > > Instead of finding all possibly required force options, only
> > > disable
> > > overwrite for now.
> > >
> > > Signed-off-by: Jan Luebbe <[email protected]>
> > > Signed-off-by: Richard Purdie <[email protected]>
> > >
> > > Take back from
> > > https://git.openembedded.org/openembedded-core/commit/?id=4292387ef6c4e80428bad6a07c844a288b27d9a1
> >
> > https://git.openembedded.org/openembedded-core/commit/?id=f058272de9c
> > ba188d96940c8c921cf31727fe4d1.
> >
> > And apt still behaves like before,  it is possible to meet the
> > problem this patch try to fix, so take it back.
> >
> > And scarthgap merged this patch,  but master not yet.  So ping for
> > master.
> >
> > if master branch reject this patch,  should scarthgap revert it?
>
> This should never have merged to scarthgap before it was merged to
> master.

Sigh.  I did do a search in master and *thought* that this patch had been
merged:

https://git.openembedded.org/openembedded-core/commit/?id=4292387ef6c4e80428bad6a07c844a288b27d9a1

Sadly I didn't notice the date was 2020, just saw the identical short
and long log message :-(

So my bad!  Sorry.

Steve

> This is why we ask people not to send patches to multiple branches at
> once but to send to master, wait until it merges and that it is seen to
> be stable, *then* request a backport.
>
> > Sorry for sending the patch to both scarthgap and master at the same
> > time and cause this confusing,
> > Will send backport request after master merge the fix in the future.
>
> Thanks, that does help everyone.
>
> In this case I will test against master and see if we can sort this out
> there. If it doesn't merge to master, we will need to revert it in
> scarthgap.
>
> Cheers,
>
> Richard
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#203223): 
https://lists.openembedded.org/g/openembedded-core/message/203223
Mute This Topic: https://lists.openembedded.org/mt/107853169/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to