File tree Expand file tree Collapse file tree 1 file changed +14
-4
lines changed Expand file tree Collapse file tree 1 file changed +14
-4
lines changed Original file line number Diff line number Diff line change @@ -89,16 +89,26 @@ Starting a New Development Cycle
8989Creating Back-Branch Release Notes
9090==================================
9191
92- * Run src/tools/git_changelog to generate a list of relevant commits
92+ * Run src/tools/git_changelog to generate a list of relevant commits.
93+ You can also run 'git log' in each branch. Be sure to use the --since
94+ branch tag and not the release date, as commits could have been done
95+ between branch stamping and the release date.
9396
9497* On the git master branch, edit and create SGML markup for the most recent
9598 branch in that branch's release-N.N.sgml file
9699
97100* Copy this into older branches' release-N.N.sgml files, then remove
98- items that do not apply based on commit logs for that branch (and add
99- any that are needed)
101+ items that do not apply based on commit logs for that branch.
102+
103+ * Add any older branch commits not in the newest branch. This can be
104+ accomplished by diff'ing the newest and older branch commit logs and
105+ looking for lines that only appear in the older branch, e.g.:
106+
107+ diff commit-N.N.log commit-O.O.log | grep '^>'
108+
109+ * Copy the appropriate release-N.N.sgml files into each back branch SGML
110+ directory.
100111
101- * Copy the appropriate release-N.N.sgml files into each back branch
102112
103113
104114---------------------------------------------------------------------------
You can’t perform that action at this time.
0 commit comments