<div dir="ltr"><div>ok let's stay as is and use the "new" name.</div><div><br></div><div>Thanks,</div><div><br></div><div>Y.<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">Le jeu. 22 juin 2023 à 16:42, Jeff McKenna <<a href="mailto:jmckenna@gatewaygeomatics.com">jmckenna@gatewaygeomatics.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi Yves,<br>
<br>
Good point, we can at least agree on standard branch naming. I like <br>
your way of "mapserver-version", so "mapserver-8", "mapserver-7.6" etc.<br>
<br>
(I was referring to the fact that we likely shouldn't rename existing <br>
branches, such as the existing "branch-6-2")<br>
<br>
-jeff<br>
<br>
<br>
<br>
<br>
<br>
<br>
On 2023-06-22 4:13 a.m., Yves Jacolin wrote:<br>
> Thank for the update!<br>
> <br>
> why do you think this is too late to get a standard way for naming the <br>
> branches? What will be the standard way?<br>
> <br>
> Thanks,<br>
> <br>
> Y.<br>
> <br>
> Le mer. 21 juin 2023 à 20:18, Jeff McKenna <br>
> <<a href="mailto:jmckenna@gatewaygeomatics.com" target="_blank">jmckenna@gatewaygeomatics.com</a> <mailto:<a href="mailto:jmckenna@gatewaygeomatics.com" target="_blank">jmckenna@gatewaygeomatics.com</a>>> a <br>
> écrit :<br>
> <br>
> Hi Yves!<br>
> <br>
> I just updated the README (and added a backback GitHub action) to the<br>
> repository. Now if we want to backport a pull request we can add the<br>
> label 'backport mapserver-8' to the pull request, and the magic will<br>
> happen when we merge it.<br>
> <br>
> I updated the README text as follows (please update it if it needs more<br>
> clarifications or if I made mistakes):<br>
> <br>
> ***<br>
> Please perform all pull requests into the main branch, and inside the<br>
> pull request mention which branch to backport the changes to; one of<br>
> the<br>
> repository managers will then apply the corresponding label, to<br>
> magically backport to that branch.<br>
> <br>
> - use branch `main' for all for all pull requests<br>
> - other branches to backport to include:<br>
> - mapserver-7.6<br>
> - branch-6-2<br>
> ***<br>
> <br>
> <br>
> (I really wish we had used a standard way for naming the branches, but,<br>
> too late now ha)<br>
> <br>
> PS. thanks for your many 8.x updates!<br>
> <br>
> -jeff<br>
> <br>
> <br>
> <br>
> <br>
> -- <br>
> Jeff McKenna<br>
> GatewayGeo: Developers of MS4W, MapServer Consulting and Training<br>
> co-founder of FOSS4G<br>
> <a href="http://gatewaygeo.com/" rel="noreferrer" target="_blank">http://gatewaygeo.com/</a> <<a href="http://gatewaygeo.com/" rel="noreferrer" target="_blank">http://gatewaygeo.com/</a>><br>
> <br>
> <br>
> <br>
> On 2023-06-20 10:15 a.m., Yves Jacolin wrote:<br>
> > Hello Developpers community, :)<br>
> ><br>
> > Following last update in MapServer 7.6 et 8.0 I created two<br>
> branches in<br>
> > basemaps project to get basemaps working with such version of<br>
> MapServer.<br>
> ><br>
> > Finally, the fix could be backported to main branch so we don't<br>
> need two<br>
> > new branches but ...<br>
> ><br>
> > # The README tells;<br>
> ><br>
> > > use the branch corresponding to your mapserver version, e.g.<br>
> ><br>
> > * branch-6-2 for mapserver versions 6.2.X<br>
> > * master for development/current mapserver versions<br>
> ><br>
> > so I don't know what is the best strategy. Creating a branch for<br>
> each<br>
> > MapServer version could be a lot of maintenance work.<br>
> ><br>
> > What do you think? One branch most compatible with most of MapServer<br>
> > Release or one branch by release?<br>
> ><br>
> > Y.<br>
> > --<br>
> > This is Yves Jacolin's card. Their email is<br>
> <a href="mailto:yves.jacolin@camptocamp.com" target="_blank">yves.jacolin@camptocamp.com</a> <mailto:<a href="mailto:yves.jacolin@camptocamp.com" target="_blank">yves.jacolin@camptocamp.com</a>>.<br>
> > Their phone number is +33 6 18 75 42 21. Their phone number is<br>
> +33 4 58<br>
> > 48 20 43. Their phone number is +41 21 619 10 43.<br>
> > <<a href="https://hihello.me/p/c7a536d1-5177-4817-8924-ebb067e58d4f" rel="noreferrer" target="_blank">https://hihello.me/p/c7a536d1-5177-4817-8924-ebb067e58d4f</a><br>
> <<a href="https://hihello.me/p/c7a536d1-5177-4817-8924-ebb067e58d4f" rel="noreferrer" target="_blank">https://hihello.me/p/c7a536d1-5177-4817-8924-ebb067e58d4f</a>>><br>
> ><br>
> <br>
-- <br>
Jeff McKenna<br>
GatewayGeo: Developers of MS4W, MapServer Consulting and Training<br>
co-founder of FOSS4G<br>
<a href="http://gatewaygeo.com/" rel="noreferrer" target="_blank">http://gatewaygeo.com/</a><br>
<br>
_______________________________________________<br>
MapServer-dev mailing list<br>
<a href="mailto:MapServer-dev@lists.osgeo.org" target="_blank">MapServer-dev@lists.osgeo.org</a><br>
<a href="https://lists.osgeo.org/mailman/listinfo/mapserver-dev" rel="noreferrer" target="_blank">https://lists.osgeo.org/mailman/listinfo/mapserver-dev</a><br>
</blockquote></div><br clear="all"><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><a href="https://hihello.me/p/c7a536d1-5177-4817-8924-ebb067e58d4f" rel="noopener" style="display:inline-block" target="_blank"><img alt="This is Yves Jacolin's card. Their email is yves.jacolin@camptocamp.com. 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." src="https://cdn.hihello.me/cards/c7a536d1-5177-4817-8924-ebb067e58d4f/signature_text.png?generated=1675087890688" style="display: inline-block; min-height: 100px;" width="360"></a></div></div>