Hi Yves,
Good point, we can at least agree on standard branch naming. I like
your way of "mapserver-version", so "mapserver-8", "mapserver-7.6" etc.
(I was referring to the fact that we likely shouldn't rename existing
branches, such as the existing "branch-6-2")
-jeff
On 2023-06-22 4:13 a.m., Yves Jacolin wrote:
Thank for the update!
why do you think this is too late to get a standard way for naming the
branches? What will be the standard way?
Thanks,
Y.
Le mer. 21 juin 2023 à 20:18, Jeff McKenna
<[email protected] <mailto:[email protected]>> a
écrit :
Hi Yves!
I just updated the README (and added a backback GitHub action) to the
repository. Now if we want to backport a pull request we can add the
label 'backport mapserver-8' to the pull request, and the magic will
happen when we merge it.
I updated the README text as follows (please update it if it needs more
clarifications or if I made mistakes):
***
Please perform all pull requests into the main branch, and inside the
pull request mention which branch to backport the changes to; one of
the
repository managers will then apply the corresponding label, to
magically backport to that branch.
- use branch `main' for all for all pull requests
- other branches to backport to include:
- mapserver-7.6
- branch-6-2
***
(I really wish we had used a standard way for naming the branches, but,
too late now ha)
PS. thanks for your many 8.x updates!
-jeff
--
Jeff McKenna
GatewayGeo: Developers of MS4W, MapServer Consulting and Training
co-founder of FOSS4G
http://gatewaygeo.com/ <http://gatewaygeo.com/>
On 2023-06-20 10:15 a.m., Yves Jacolin wrote:
> Hello Developpers community, :)
>
> Following last update in MapServer 7.6 et 8.0 I created two
branches in
> basemaps project to get basemaps working with such version of
MapServer.
>
> Finally, the fix could be backported to main branch so we don't
need two
> new branches but ...
>
> # The README tells;
>
> > use the branch corresponding to your mapserver version, e.g.
>
> * branch-6-2 for mapserver versions 6.2.X
> * master for development/current mapserver versions
>
> so I don't know what is the best strategy. Creating a branch for
each
> MapServer version could be a lot of maintenance work.
>
> What do you think? One branch most compatible with most of MapServer
> Release or one branch by release?
>
> Y.
> --
> This is Yves Jacolin's card. Their email is
[email protected] <mailto:[email protected]>.
> Their phone number is +33 6 18 75 42 21. Their phone number is
+33 4 58
> 48 20 43. Their phone number is +41 21 619 10 43.
> <https://hihello.me/p/c7a536d1-5177-4817-8924-ebb067e58d4f
<https://hihello.me/p/c7a536d1-5177-4817-8924-ebb067e58d4f>>
>
--
Jeff McKenna
GatewayGeo: Developers of MS4W, MapServer Consulting and Training
co-founder of FOSS4G
http://gatewaygeo.com/
_______________________________________________
MapServer-dev mailing list
[email protected]
https://lists.osgeo.org/mailman/listinfo/mapserver-dev
