Development Updates/Status: *development* branch, and debian/changelog file maintenance. #794
Closed
petersilva
announced in
Announcements
Replies: 3 comments
-
oh... I guess an obvious corrolary: Don't need to use the v03 or v03only tags anymore. That is assumed. It is now incumbent to label v2 issues explicitly, flipping the onus. |
Beta Was this translation helpful? Give feedback.
0 replies
-
After discussion:
|
Beta Was this translation helpful? Give feedback.
0 replies
-
made sarrac branch default to "development" and the release branch is now called "stable" |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
So, now that version 3 is the released version on github, pretty much everyone is expected to use the new version. It no longer makes sense to call version 3 a work in progress. So the principle development branch, which until now has been called v03_wip is now simply called development.
Another attempt to clarify work in progress is a super-lightweight "project planning" method: putting stuff in the change log. The debian/changelog file is a required file to build debian packages, and conventionally lists the changes in each version. Changes to that file are not included in PR's because they always cause merge issues, because no-one knows in which order features will be merged, so the lines always end up as conflicts to be resolved.
So the convention has been to, once in a while, after a number of PR's to the development branch have been accepted, to update debian/changelog manually to reflect those PR's. One of the final steps of a release is polishing the content of that file. So the changes to that file are done via direct commits to the development branch and not PR's. They could also be done by PR's that ONLY contain the changelog changes, the essential thing is not to mix changes to the changelog with substantive ones.
A new thing being tried for v3.0.46 is to include a little planning information, or forward looking information in the changelog to guide potential contributors towards things that are considered most helpful to work on. Here is an example:
So anybody can find out what the plans are in development by just looking at:
https://github.com/MetPX/sarracenia/blob/development/debian/changelog
at any time... Does this make sense as a planning aide/ status update method?
Beta Was this translation helpful? Give feedback.
All reactions