usr.sbin/etcupdate/tests.sh

310 	# generate a new link conflict.
318 	# This should generate a new file conflict.
431 	# to the new file if possible.  If the merge fails, a conflict
446 	cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
449 	cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
452 	cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
464 	# /adddir/conflict: Add a new file in a directory that already
466 	mkdir $NEW/adddir/conflict
467 	touch $NEW/adddir/conflict/newfile
468 	touch $TEST/adddir/conflict
490 	# /rmdir/conflict: Do not remove a directory with a conflicted
493 		mkdir $i/rmdir/conflict
495 	mkfifo $OLD/rmdir/conflict/difftype
496 	mkdir $TEST/rmdir/conflict/difftype
559 	# /dirchange/fromdir/conflict: Convert a directory tree to a
563 		mkdir $i/dirchange/fromdir/conflict
565 	echo "foo" > $OLD/dirchange/fromdir/conflict/somefile
566 	echo "bar" > $TEST/dirchange/fromdir/conflict/somefile
567 	mkfifo $NEW/dirchange/fromdir/conflict
578 	# the conflict is due to a change in the file type.
721 # $1 - relative path to a regular file that should have a conflict
722 # $2 - optional MD5 of the conflict file contents
723 conflict()
728 		echo "File $1 missing conflict"
807 	conflict /second/second/difffiles/file 4f2ee8620a251fd53f06bb6112eb6ffa
829 	conflict /difftype/difftype/difffiles/file \
862 	file /difffiles/difffiles/difffiles/conflict "this is a test file"
863 	conflict /difffiles/difffiles/difffiles/conflict \
866 	## /adddir/conflict:
867 	file /adddir/conflict
877 	## /rmdir/conflict:
878 	dir /rmdir/conflict/difftype
879 	present /rmdir/conflict
900 	## /dirchange/fromdir/conflict:
901 	file /dirchange/fromdir/conflict/somefile "bar"
945   C /difffiles/difffiles/difffiles/conflict
967   Modified regular file remains: /dirchange/fromdir/conflict/somefile
971   Modified directory remains: /rmdir/conflict/difftype
973   Non-empty directory remains: /rmdir/conflict
979   New link conflict: /difftype/difftype/difflinks/link ("new" vs "test")
983   Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
987   New file mismatch: /adddir/conflict (directory vs regular file)
988   Directory mismatch: $TEST/adddir/conflict (regular file)
991   New link conflict: /second/second/difflinks/link ("new link" vs "test link")