mirror/rsync
1
0 Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-10-22 05:44:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Next step: allow protocol 30 to be used, but disallow the use

Browse Source 
of incremental recursion.  If this still avoids the hanging, I
will need to try to track down how inc_recurse can deadlock.
This commit is contained in:
Wayne Davison committed 2007-03-14 00:02:39 +00:00
1 parent 5275029d11
commit b9d5eea5c6
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
testsuite/merge.test
+4 -4
View File
@@ -41,10 +41,10 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/
cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
# Get rid of any directory-time differences
$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from1dir/" "$from2dir/"
$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from2dir/" "$from3dir/"
$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from1dir/" "$chkdir/"
$RSYNC -av --protocol=29 --existing -f 'exclude,! */' "$from3dir/" "$chkdir/"
$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from1dir/" "$from2dir/"
$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from2dir/" "$from3dir/"
$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from1dir/" "$chkdir/"
$RSYNC -av --no-ir --existing -f 'exclude,! */' "$from3dir/" "$chkdir/"
checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"