The International Simutrans Forum

Simutrans Extended => Simutrans-Extended development => Simutrans-Extended bug reports => Topic started by: Rollmaterial on August 24, 2021, 01:48:18 PM

Title: Erroneous commit tag in game window
Post by: Rollmaterial on August 24, 2021, 01:48:18 PM
The game window title doesn't seem to display a correct commit tag since a few days.
Title: Re: Erroneous commit tag in game window
Post by: Matthew on August 24, 2021, 02:42:53 PM
James mentions that this is a by-product of a change to his build process in this post (https://forum.simutrans.com/index.php/topic,20355.msg196602.html#msg196602).

It seems to me that this is an unfortunate development. It is going to be difficult for contributors to be sure that they have reproduced a problem/change if we are not clear whether we are compiling the same revision of the code as B-B or not. There have also been several occasions when the the nightly update has produced a broken client and users have needed to update to a specific new revision.

I guess that James tolerated this regression because it avoided a worse problem, so it's a necessary compromise, but hopefully not for too long.
Title: Re: Erroneous commit tag in game window
Post by: jamespetts on August 24, 2021, 08:56:49 PM
I agree that this is unfortunate - I am not entirely sure of the details of the causation of this, and was not aware until recently that this was new. I am not sure exactly what file change on the server caused the issue, nor what the effect of a git reset (which I believe would be necessary to re-synchronise the commits) would be, at least not without very, very extensive investigation. It is difficult immediately to think of a solution to this that would not take an unreasonable and possibly extreme amount of time to check and investigate - it is possible in principle that there is a straightforward solution, but, given how unclear the causation of this is at present, it is not immediately clear what that might be.
Title: Re: Erroneous commit tag in game window
Post by: Sirius on August 24, 2021, 10:44:25 PM
I am not sure if I understand the issue correctly. B-B does not build the latest master but instead a local branch based on master?

In any case, the following might help to identify the difference betwen your local state and the master:
git status will show local uncommitted changes.
git diff --name-only master... will show files that changed in your branch after the last common commit of your branch and master.
use git diff master... to see what has changed in those files.
Use git diff master... filename.cc to see what has changed in filename.cc
Title: Re: Erroneous commit tag in game window
Post by: jamespetts on August 28, 2021, 09:20:30 PM
Thank you to Freahk for this explanation. I have had a go at fixing this - I should be grateful if people could re-test with the manual rebuild that is currently in progress.
Title: Re: Erroneous commit tag in game window
Post by: Sirius on October 27, 2021, 04:20:47 PM
Sorry for the late reply. It doesn't seem to be fixed.
Latest commit (2 days ago) is ce091b6, but latest bridgewater nightly is 7cdd1bd
Title: Re: Erroneous commit tag in game window
Post by: jamespetts on January 29, 2022, 05:34:12 PM
This is not actually an issue with the code itself, but with the configuration of the Bridgewater-Brunel server. However, I believe that this has now been fixed - I should be grateful if you could confirm.