<html>
<head>
</head>
<body class='hmmessage'><div dir='ltr'>
<style><!--
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
font-size: 12pt;
font-family:Calibri
}
--></style>
<div dir="ltr">All: I've updated the RFC per our discussion thus far:<br><br><br><br>https://github.com/mapserver/docs/blob/branch-6-0/en/development/rfc/ms-rfc-7.2.txt<br><br>https://github.com/mapserver/docs/commit/a31092464bde60863573c0688b6e5baf4137bd38<br><br><br><br><div><div id="SkyDrivePlaceholder"></div>> Date: Wed, 3 Oct 2012 18:13:03 +0200<br>> From: stephan@meissl.name<br>> To: mapserver-dev@lists.osgeo.org<br>> Subject: Re: [mapserver-dev] RFC-7.2: MapServer Git Push Management<br>> <br>> On 10/03/2012 09:43 AM, thomas bonfort wrote:<br>> > Thanks Tom for taking this.<br>> > <br>> > On Tue, Oct 2, 2012 at 9:04 PM, Lime, Steve D (DNR)<br>> > <Steve.Lime@state.mn.us> wrote:<br>> >> Thanks for doing this Tom. Couple of things to discuss:<br>> >><br>> >><br>> >><br>> >> 1) We’ve talked about getting rid of HISTORY.TXT and somehow relying on<br>> >> commit comments. Any thoughts on this?<br>> > <br>> > How I envision this is to keep HISTORY.TXT as a means to highlight the<br>> > noteworthy additions to mapserver in major releases. The reason for<br>> > *not* updating HISTORY.TXT in stable branches is twofold:<br>> > - The changes we publicize between stable versions need to be<br>> > complete. The commit log is a good source for this, as it does not<br>> > rely on manually updating the history file.<br>> > - The goal is to ease fixes being committed to the stable branch<br>> > rather than only the development one, and updating HISTORY in the<br>> > stable branch will always cause merge conflicts when merging the<br>> > stable branch back into the master one.<br>> > <br>> +1 for easier merges<br>> > <br>> >><br>> >> 2) In the Git Commit Practices section there’s mention of msautotest.<br>> >> That’s changed now with the test on commit testing and “make test” support.<br>> > <br>> > The tests are still added to msautotest. make test and the continuous<br>> > integration are just wrappers around running the original msautotest<br>> > suite. I would like to include a requirement (or at least a very<br>> > strong recommendation) that all new features get a batch of autotests,<br>> > if possible also exercising corner cases.<br>> > Regarding tests, and given that our test suite is now fully passing, I<br>> > would also like to include a requirement that a commit does not break<br>> > any of the existing tests (or that the test suite be updated with<br>> > expected results if required). Using pull requests rather than<br>> > directly committing to the branches is a practical way of testing<br>> > proposed changes before inclusion.<br>> > How do you guys feel about adding these to RFC7.2 ? /me feels a little<br>> > bit awkward at forcing down these kind of rules, but think that they<br>> > will be beneficial in the long run.<br>> > <br>> +1 IMHO, using the proposed process and also documenting it is a great<br>> sign of quality to users<br>> >><br>> >> 3) Should the coding style (astyle) be mentioned?<br>> > Good point. I'll update the RFC accordingly.<br>> >><br>> >><br>> >><br>> >> Steve<br>> >><br>> >><br>> >><br>> >> From: mapserver-dev-bounces@lists.osgeo.org<br>> >> [mailto:mapserver-dev-bounces@lists.osgeo.org] On Behalf Of Tom Kralidis<br>> >> Sent: Tuesday, October 02, 2012 12:57 PM<br>> >> To: mapserver-dev@lists.osgeo.org<br>> >> Subject: [mapserver-dev] RFC-7.2: MapServer Git Push Management<br>> >><br>> >><br>> >><br>> >> FYI given our move to Git/GitHub, RFC 7.1 needs updating.<br>> >><br>> >> http://www.mapserver.org/development/rfc/ms-rfc-7.2.html now obsoletes 7.1,<br>> >> and thus we need review/comment and subsequent vote.<br>> >><br>> >> ..Tom<br>> >><br>> >><br>> >> _______________________________________________<br>> >> mapserver-dev mailing list<br>> >> mapserver-dev@lists.osgeo.org<br>> >> http://lists.osgeo.org/mailman/listinfo/mapserver-dev<br>> >><br>> > _______________________________________________<br>> > mapserver-dev mailing list<br>> > mapserver-dev@lists.osgeo.org<br>> > http://lists.osgeo.org/mailman/listinfo/mapserver-dev<br>> > <br>> <br>> _______________________________________________<br>> mapserver-dev mailing list<br>> mapserver-dev@lists.osgeo.org<br>> http://lists.osgeo.org/mailman/listinfo/mapserver-dev<br></div></div>
</div></body>
</html>