Re: [Flightgear-devel] MiG-15 patches

[James T. <ja...@fl...>]

> On 20 Dec 2021, at 10:25, Michael Danilov <mik...@gm...> wrote:
> 
> And is the default branch for Next, and 2020.3 branch not getting
> those updates by default? Would it be ok to first push the version of
> changes for Next and then try to backport?

SVN trunk (default) is for FlightGear-next : it’s what gets packaged to the ‘trunk catalog’ at:

	http://ukmirror.flightgear.org/fgaddon/Aircraft-trunk/ <http://ukmirror.flightgear.org/fgaddon/Aircraft-trunk/>


The 2020.3 branch in FGaddon is what gets packaged into the stable catalog which is of course what FlightGear 2020.3.x use:

	http://ukmirror.flightgear.org/fgaddon/Aircraft-2020/ <http://ukmirror.flightgear.org/fgaddon/Aircraft-2020/>

There is no automatic moving of changes (whether bug fixes or updates) from trubk to that branch in FGaddon/SVN : it needs to be done explicitly by aircraft maintainers. In your case I would suggest:

	- apply changes to SVN trunk, then people using 2020.4 / nightlies can instal the aircraft from the trunk hangar and give feedback (or just grab the Zip from  MiG-15.zip <http://ukmirror.flightgear.org/fgaddon/Aircraft-trunk/MiG-15.zip> )

	- once you are happy with them, apply all changes which make sense for 2020.3, to the 2020.3 branch in SVN.

Kind regards,
James