The branch, master has been updated via b51b0b32 Get the NEWS heading idiom right. from 8cb1c995 A few more https changes.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b51b0b323626fc71507b01f72e9de51f206ef2f0 Author: Wayne Davison <wa...@opencoder.net> Date: Mon Jun 22 14:43:01 2020 -0700 Get the NEWS heading idiom right. ----------------------------------------------------------------------- Summary of changes: NEWS.md | 8 +++++--- packaging/release-rsync | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS.md b/NEWS.md index a2d9f0f0..e6c3365f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ -<a name="3.2.1pre1"></a> +<a name="3.2.1"></a> -# NEWS for rsync 3.2.1pre1 (21 Jun 2020) +# NEWS for rsync 3.2.1 (UNRELEASED) Protocol: 31 (unchanged) @@ -46,7 +46,9 @@ Protocol: 31 (unchanged) info (plus the status of a couple extra optimizations) by repeating the `--version` option (e.g. `-VV`). - - Updated various URLs in the documentation to be https instead of http. + - Updated various URLs to be https instead of http. + + - Some documentation improvements. ### PACKAGING RELATED: diff --git a/packaging/release-rsync b/packaging/release-rsync index 3d78f3ae..3afa79bd 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -189,11 +189,11 @@ About to: txt = replace_or_die(x_re, repl, txt, f"Unable to find SUBPROTOCOL_VERSION define in {fn}") elif fn == 'NEWS.md': efv = re.escape(finalversion) - # The following refuses to match a 1.2.3 version without suffix because it was already released. - x_re = re.compile(r'^<.+>\s+# NEWS for rsync \d+\.\d+\.\d+[a-z].+\s+Protocol: .+\n') - repl = (f'<a name="{version}"></a>\n\n# NEWS for rsync {version} ({today})\n\n' + x_re = re.compile(r'^<.+>\s+# NEWS for rsync %s \(UNRELEASED\)\s+Protocol: .+\n' % efv) + rel_day = 'UNRELEASED' if pre else today + repl = (f'<a name="{finalversion}"></a>\n\n# NEWS for rsync {finalversion} ({rel_day})\n\n' + f"Protocol: {protocol_version} ({proto_changed})\n") - good_top = repl.replace(version, version + 'dev') + good_top = re.sub(r'\(.*?\)', '(UNRELEASED)', repl, 1) msg = f"The top lines of {fn} are not in the right format. It should be:\n" + good_top txt = replace_or_die(x_re, repl, txt, msg) x_re = re.compile(r'^(\| )(\S{2} \S{3} \d{4})(\s+\|\s+%s\s+\| ).{11}(\s+\| )\S{2}(\s+\|+)$' % efv, re.M) -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs