Re: [Freemint-discuss] Debugging a problem in gcc-14

[Miro K. <mir...@gm...>]

On Thu, 30 May 2024 at 12:43, Thorsten Otto <ad...@th...> wrote:

> I think that wont work. Both the mint/gcc-13 branch (which is now at
> gcc-13.3.0) and the mint/gcc-14 branch have common commits from the master
> branch, but with different ids.
>
> I've already tried to create a new branch starting from mint/gcc-13, then
> merge mint/gcc-14 into it. But that gave several hundred merge conflicts.
>
> Or what exact would you try to do?
>
Make it even simpler. :-) It goes both ways: everything in gcc-13 is surely
committed to gcc-14. Assuming that gcc-14 (then-master) wasn't just
horribly broken every second commit you can basically just choose a point
in history (e.g. the fork of master and gcc-13 branch but can be something
later, too) where do you apply our patches and then do the rebase of the
rest of gcc-14.

There's a slight chance you will bump into missing some last-minute fixes
(so you will have to move the rebase to a later commit) but that's easy to
detect and not so probable. Certainly faster than any other alternative.

-- 
http://mikro.atari.org