$RSYNC -ai "$fromdir/block" "$todir/block2" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-cD++++++ block
+cD+++++++ block
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
$RSYNC -ai "$fromdir/block2" "$todir/block" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-cD++++++ block2
+cD+++++++ block2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
$RSYNC -Di "$fromdir/block3" "$todir/block" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-cD..T... block3
+cD..T.... block3
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-.d..t... ./
-cD..t... block
-cD...... block2
-cD++++++ block3
-hD++++++ block2.5 => block3
-cD++++++ char
-cD++++++ char2
-cD++++++ char3
-cS++++++ fifo
+.d..t.... ./
+cD..t.... block
+cD....... block2
+cD+++++++ block3
+hD+++++++ block2.5 => block3
+cD+++++++ char
+cD+++++++ char2
+cD+++++++ char3
+cS+++++++ fifo
EOT
if test ! -b "$fromdir/block2.5"; then
sed -e '/block2\.5/d' \
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-cd++++++ bar/
-cd++++++ bar/baz/
->f++++++ bar/baz/rsync
-cd++++++ foo/
->f++++++ foo/config1
->f++++++ foo/config2
->f++++++ foo/extra
-cL++++++ foo/sym -> ../bar/baz/rsync
+cd+++++++ bar/
+cd+++++++ bar/baz/
+>f+++++++ bar/baz/rsync
+cd+++++++ foo/
+>f+++++++ foo/config1
+>f+++++++ foo/config2
+>f+++++++ foo/extra
+cL+++++++ foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
$RSYNC -iplrH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
->f..T... bar/baz/rsync
->f..T... foo/config1
->f.sTp.. foo/config2
-hf..T... foo/extra => foo/config1
+>f..T.... bar/baz/rsync
+>f..T.... foo/config1
+>f.sTp... foo/config2
+hf..T.... foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.f..tp.. bar/baz/rsync
-.d..t... foo/
-.f..t... foo/config1
->fcstp.. foo/config2
-cL..T... foo/sym -> ../bar/baz/rsync
+.f..tp... bar/baz/rsync
+.d..t.... foo/
+.f..t.... foo/config1
+>fcstp... foo/config2
+cL..T.... foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-.d ./
-.d bar/
-.d bar/baz/
-.f...p.. bar/baz/rsync
-.d foo/
-.f foo/config1
->f..t... foo/config2
-hf foo/extra
-.L foo/sym -> ../bar/baz/rsync
+.d ./
+.d bar/
+.d bar/baz/
+.f...p... bar/baz/rsync
+.d foo/
+.f foo/config1
+>f..t.... foo/config2
+hf foo/extra
+.L foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
$RSYNC -iplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.f...p.. foo/config1
->f..t... foo/config2
+.f...p... foo/config1
+>f..t.... foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-.d..t... ./
-cd++++++ bar/
-cd++++++ bar/baz/
-cf bar/baz/rsync
-cd++++++ foo/
-cf foo/config1
-cf foo/config2
-hf foo/extra => foo/config1
-cL..T... foo/sym -> ../bar/baz/rsync
+.d..t.... ./
+cd+++++++ bar/
+cd+++++++ bar/baz/
+cf bar/baz/rsync
+cd+++++++ foo/
+cf foo/config1
+cf foo/config2
+hf foo/extra => foo/config1
+cL..T.... foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
$RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t... ./
-cd++++++ bar/
-cd++++++ bar/baz/
-cd++++++ foo/
-hf foo/extra => foo/config1
+.d..t.... ./
+cd+++++++ bar/
+cd+++++++ bar/baz/
+cd+++++++ foo/
+hf foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-.d..t... ./
-cd++++++ bar/
-cd++++++ bar/baz/
-hf bar/baz/rsync
-cd++++++ foo/
-hf foo/config1
-hf foo/config2
-hf foo/extra => foo/config1
-hL foo/sym -> ../bar/baz/rsync
+.d..t.... ./
+cd+++++++ bar/
+cd+++++++ bar/baz/
+hf bar/baz/rsync
+cd+++++++ foo/
+hf foo/config1
+hf foo/config2
+hf foo/extra => foo/config1
+hL foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
$RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t... ./
-cd++++++ bar/
-cd++++++ bar/baz/
-cd++++++ foo/
+.d..t.... ./
+cd+++++++ bar/
+cd+++++++ bar/baz/
+cd+++++++ foo/
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
# TODO fix really-old problem when combining -H with --compare-dest:
# missing output for foo/extra hard-link (and it might not be updated)!
cat <<EOT >"$chkfile"
-.d..t... ./
-cd++++++ bar/
-cd++++++ bar/baz/
-.f bar/baz/rsync
-cd++++++ foo/
-.f foo/config1
-.f foo/config2
-.L foo/sym -> ../bar/baz/rsync
+.d..t.... ./
+cd+++++++ bar/
+cd+++++++ bar/baz/
+.f bar/baz/rsync
+cd+++++++ foo/
+.f foo/config1
+.f foo/config2
+.L foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
$RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t... ./
-cd++++++ bar/
-cd++++++ bar/baz/
-cd++++++ foo/
+.d..t.... ./
+cd+++++++ bar/
+cd+++++++ bar/baz/
+cd+++++++ foo/
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"