The branch, b3.0.x has been updated via 033697d Make --delete-excluded work better with --filter=merge. via abc7966 When modifying PATH, export it (for Solaris). from 998df4b Added "SORTED TRANSFER ORDER" manpage section.
;a=shortlog;h=b3.0.x - Log ----------------------------------------------------------------- commit 033697d96db0d28fe7b68a191665a8db80375bdb Author: Wayne Davison <way...@samba.org> Date: Thu Sep 15 07:40:50 2011 -0700 Make --delete-excluded work better with --filter=merge. commit abc796661d6d3a5b37cb0642e7e9885f6a271d60 Author: Wayne Davison <way...@samba.org> Date: Thu Sep 15 07:27:23 2011 -0700 When modifying PATH, export it (for Solaris). ----------------------------------------------------------------------- Summary of changes: exclude.c | 8 ++------ runtests.sh | 5 ++++- 2 files changed, 6 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/exclude.c b/exclude.c index 6101dda..c8edec5 100644 --- a/exclude.c +++ b/exclude.c @@ -901,13 +901,9 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags, exit_cleanup(RERR_SYNTAX); } - /* --delete-excluded turns an un-modified include/exclude into a - * sender-side rule. We also affect per-dir merge files that take - * no prefixes as a simple optimization. */ + /* --delete-excluded turns an un-modified include/exclude into a sender-side rule. */ if (delete_excluded - && !(new_mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE)) - && (!(new_mflags & MATCHFLG_PERDIR_MERGE) - || new_mflags & MATCHFLG_NO_PREFIXES)) + && !(new_mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE|MATCHFLG_MERGE_FILE|MATCHFLG_PERDIR_MERGE))) new_mflags |= MATCHFLG_SENDER_SIDE; *len_ptr = len; diff --git a/runtests.sh b/runtests.sh index 41d566b..490795e 100755 --- a/runtests.sh +++ b/runtests.sh @@ -129,7 +129,10 @@ RUNSHFLAGS='-e' export RUNSHFLAGS # for Solaris -[ -d /usr/xpg4/bin ] && PATH="/usr/xpg4/bin/:$PATH" +if [ -d /usr/xpg4/bin ]; then + PATH="/usr/xpg4/bin/:$PATH" + export PATH +fi if [ "x$loglevel" != x ] && [ "$loglevel" -gt 8 ]; then if set -x; then -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs