The branch, master has been updated via d274b209 Have release script use patch-update --make (not --shell) via 0327a252 Fix a grammar error. from f43412f1 More spelling fixes.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit d274b2096fe032ba556899c9caac9972912cc993 Author: Wayne Davison <wa...@opencoder.net> Date: Sat Jul 25 10:52:49 2020 -0700 Have release script use patch-update --make (not --shell) commit 0327a2526b8f3e6c050e4541805b8b702ba5d7ce Author: Wayne Davison <wa...@opencoder.net> Date: Sat Jul 25 10:40:46 2020 -0700 Fix a grammar error. ----------------------------------------------------------------------- Summary of changes: packaging/release-rsync | 8 ++++---- rsync.1.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/release-rsync b/packaging/release-rsync index 08779e4f..8423fc53 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -233,8 +233,8 @@ About to: - git commit all changes - generate the manpages - merge the {args.master_branch} branch into the patch/{args.master_branch}/* branches - - update the files in the "patches" dir and OPTIONALLY - (if you type 'y') to launch a shell for each patch + - update the files in the "patches" dir and OPTIONALLY (if you type 'y') to + run patch-update with the --make option (which opens a shell on error) """) ans = input("<Press Enter OR 'y' to continue> ") @@ -255,8 +255,8 @@ About to: die('Aborting') if re.match(r'^y', ans, re.I): - print(f'\nVisiting all "patch/{args.master_branch}/*" branches ...') - cmd_run(f"packaging/patch-update --branch={args.master_branch} --skip-check --shell") + print(f'\nRunning smart-make on all "patch/{args.master_branch}/*" branches ...') + cmd_run(f"packaging/patch-update --branch={args.master_branch} --skip-check --make") if os.path.isdir('patches/.git'): s = cmd_run(f"cd patches && git commit -a -m 'The patches for {version}.'") diff --git a/rsync.1.md b/rsync.1.md index 57a878be..7a73faa0 100644 --- a/rsync.1.md +++ b/rsync.1.md @@ -2364,7 +2364,7 @@ your home directory (remove the '=' for that). specify `-zz`. See also the `--skip-compress` option for the default list of file suffixes - that will transferred with no (or minimal) compression. + that will be transferred with no (or minimal) compression. 0. `--compress-choice=STR`, `--zc=STR` -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs