On Mon, Dec 23, 2019 at 09:53:00AM -0800, Tom Eastep wrote: > On 12/23/19 6:23 AM, Roberto C. Sánchez wrote: > > > > I'd like to see if we can exercise the merge request process. Would you > > be willing to submit your proposed change as a merge request? > > > > Roberto, > > I certainly can -- I have several 5.2.3 patches queued up which I can > push to the 5.2.3 branch on Gitlab. They will then show up there as > merge requests (I've done that before). > I had forgotten that we've already done that once before. It seems to be working for us, so let's continue using that approach.
> Going forward, how do we want to handle updates to the known problems, > change log and release notes? Traditionally, I have updated known > problems when I have identified a problem then I update that document > again when I am preparing a release (to indicate which release the > defect is corrected in). I typically update the change log and release > notes periodically during the release cycle for both features and bug fixes. > > If we are going to submit changes as merge requests, then maybe updates > to the release documents should be submitted along with the code change > itself. That could be done by including the text in the commit message > body or by submitting a companion update the the release repository. I > don't have a strong opinion either way, but the latter approach would > result in less work for whoever ends up doing the final release work. > I favor including the documentation changes in the same MR as the code changes. I don't have a strong feeling on if the documentation changes should be in the same commit as the code changes or if code and documentation are changed in separate commits that are in the same MR. Though, the larger the code change, the more likely it makes sense to separate the documentation change into a different commit. Regardless, they should be in very near proximity to each other. Regards, -Roberto -- Roberto C. Sánchez http://people.connexer.com/~roberto http://www.connexer.com _______________________________________________ Shorewall-users mailing list Shorewall-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/shorewall-users
