[hatari-devel] WinUae CPU for hatari

[Nicolas Pomarède]

Le 06/11/2010 10:30, Laurent Sallafranque a écrit :
> Hello,
>
> I still have very few linking problems to fix before starting to let run
> the new core.
> There's still the big problem in cpu core (see my precedent help message).
>
> Actually, I upload little changes to share with you my work.
> But when we'll want to update WinUae core later (if needed), I think
> it'll be hard to know what was changed.
>
> Is there a way to remove all the intermediate uploads to keep only
> - first winUae original code
> - first working Harati's fixes and changes
>
> Regards
>
> Laurent

Hello, I'm not sure it's possible to remove intermediate commits, but 
knowing the revision number when winuae code was uploaded and knowing 
the working revision number, hg can do a diff between these 2 specific 
revision.

Another approach is to keep the original winuae source (let's say it's 
2.3.0). When Winuae 2.3.1 is released, do a diff between 2.3.1 and 2.3.0 
and try to apply this diff to Hatari's code.

It's possible the diff will conflict, but hopefully changes will be 
minimal and it could be solved by hand.

Nicolas