mirror/rsync
1
0 Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-10-21 13:24:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that there are no directory-time differences between the

Browse Source 
dirs that might trip up the check of the merged copy.
This commit is contained in:
Wayne Davison committed 2005-02-15 02:01:02 +00:00
1 parent 96a8ca6d98
commit 2f24fb18c4
1 file changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files
testsuite/merge.test
+4 -3
View File
@@ -43,9 +43,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
touch "$from1dir" "$from2dir" "$from3dir" \
"$from1dir"/dir-and-not-dir "$from2dir"/sub1 "$from3dir"/sub1 "$from3dir"/sub2 \
"$chkdir" "$chkdir"/dir-and-not-dir "$chkdir"/sub1 "$chkdir"/sub2
$RSYNC -av --existing -f 'exclude,! */' "$from1dir/" "$from2dir/"
$RSYNC -av --existing -f 'exclude,! */' "$from2dir/" "$from3dir/"
$RSYNC -av --existing -f 'exclude,! */' "$from1dir/" "$chkdir/"
$RSYNC -av --existing -f 'exclude,! */' "$from3dir/" "$chkdir/"
checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"