Re: stable vs. master branches
At 18:17 -0800 22 Feb 2022, "Kevin J. McCarthy" wrote: On Tue, Feb 22, 2022 at 04:27:25PM -0800, Kevin J. McCarthy wrote: On Tue, Feb 22, 2022 at 07:07:42PM -0500, Aaron Schrab wrote: 955d281f6 (Add missing period in a comment., 2021-04-08) [...] That was a merge request from someone on gitlab. It fixes a typo in a code comment, so (IMO) doesn't need to go into a stable release. Sorry I missed the point of confusion here. The "AuthorDate:" for the commit is 2021-04-08. I presume it sat in their own branch for the last year and they put it into a merge request after the 2.2.0 release. However the "CommitDate:" is 2022-02-13. Ahh, yes. I hadn't considered that such a simple change would be held for that long. If I'd seen that commit date I wouldn't have asked about that. For larger, more complex changes it can make a bit more sense. The one change that I apply on top of master is nearing 5 years from the commit date without being submitted, since I keep putting off writing decent documentation for it. signature.asc Description: PGP signature
Re: stable vs. master branches
On Tue, Feb 22, 2022 at 04:27:25PM -0800, Kevin J. McCarthy wrote: On Tue, Feb 22, 2022 at 07:07:42PM -0500, Aaron Schrab wrote: 955d281f6 (Add missing period in a comment., 2021-04-08) [...] That was a merge request from someone on gitlab. It fixes a typo in a code comment, so (IMO) doesn't need to go into a stable release. Sorry I missed the point of confusion here. The "AuthorDate:" for the commit is 2021-04-08. I presume it sat in their own branch for the last year and they put it into a merge request after the 2.2.0 release. However the "CommitDate:" is 2022-02-13. -- Kevin J. McCarthy GPG Fingerprint: 8975 A9B3 3AA3 7910 385C 5308 ADEF 7684 8031 6BDA signature.asc Description: PGP signature
Re: stable vs. master branches
On Tue, Feb 22, 2022 at 07:07:42PM -0500, Aaron Schrab wrote: Just now after updating my build (based on master) after the release of 2.2.1, I decided to look at the commits that aren't included in the stable branch. Other than the merges of stable back into master I see only one commit: 955d281f6 (Add missing period in a comment., 2021-04-08) Doing a diff between the branches verifies that that's currently the only difference. Was there some reason for not including that in stable? That was a merge request from someone on gitlab. It fixes a typo in a code comment, so (IMO) doesn't need to go into a stable release. If not this seems like a good time to merge the master branch into stable to reduce (temporarily eliminate) the number of commits on master but not in stable. The stable branch is used to create the point releases. e.g. 2.2.1, 2.2.2, 2.2.3... After making any commits to stable, I merge back into master right away so that mainline development contains those bug fixes. Master is used for development towards the next major release, which in this case would be 2.3.0. Master only gets merged into stable right after a major release. For example, I did so just after the 2.2.0 release. The merge should not be done in other cases, because that would pollute the stable branch with potentially "in progress" development. -- Kevin J. McCarthy GPG Fingerprint: 8975 A9B3 3AA3 7910 385C 5308 ADEF 7684 8031 6BDA signature.asc Description: PGP signature
stable vs. master branches
Just now after updating my build (based on master) after the release of 2.2.1, I decided to look at the commits that aren't included in the stable branch. Other than the merges of stable back into master I see only one commit: 955d281f6 (Add missing period in a comment., 2021-04-08) Doing a diff between the branches verifies that that's currently the only difference. Was there some reason for not including that in stable? If not this seems like a good time to merge the master branch into stable to reduce (temporarily eliminate) the number of commits on master but not in stable. signature.asc Description: PGP signature
