Re: [hatari-devel] Hatari screen dialog regression

[Eero Tamminen <oak@xxxxxxxxxxxxxx>]

Hi,

On 21.8.2025 9.27, Thomas Huth wrote:
> Am Sat, 16 Aug 2025 07:01:35 +0200
> schrieb Andreas Grabher <andreas_g86@xxxxxxxxxx>:
> > Does the fact that 2.6.1 has been released mean, that my patch (which I made on your request) is ignored?
>
> The patch looks fine to me! Eero, do you have any objections? Otherwise,
> I'll commit it.

Before it's applied, I'd like to know which parts of Hatari are:
- Used as-is
- Modified
- Ignored

In Previous, so that I can document both upstream[1] and downstream[2] 
project considerations in Hatari "coding.txt".  Andreas?


[1] Nicolas, currently only WinAUE CPU core code is used as-is, i.e. 
code to that should go through WinUAE, right?

[2] Hatari has several downstream projects, ones that I know of:
- HatariB: https://www.atari-forum.com/viewtopic.php?t=43008
- HRDB: https://github.com/tattlemuss/hatari/
- Previous

And some projects that haven't kept up:
- Hataroid - Android version
- RetroArch Hatari version (HatariB is newer version of this)


On 13.8.2025 23.15, Andreas Grabher wrote:
> As mentioned I have no git here.

Andreas, how you're developing Previous and keeping track of Hatari if 
you're not using Git?

Git would make it much easier to manage changes on top of Hatari code, 
without that code needing to be split into separate files.

As long as your changes are not within couple of lines of Hatari 
changes, updating to new Hatari version would be just:
* Updating your tracking branch for upstream Hatari, e.g.:
  git checkout upstream && git pull
* Rebasing your own changes on top of the updated Hatari sources:
  git checkout main && git rebase upstream

(Pull will always succeed, but rebase operation can ask resolve of 
conflicts if branches have different changes to same place in code.)


	- Eero