Lines Matching full:file
66 # The various states of the comparison of a file between two trees.
76 # For an given file, there are three different pair-wise
83 # as a file merge that results in conflicts versus one that
109 echo "foo" > $i/equal/equal/equal/file
114 # /equal/first/first: The file is missing from the test
118 echo "foo" > $i/equal/first/first/file
123 # /equal/difftype/difftype: The local file is a different
132 # /equal/difflinks/difflinks: The local file is a modified
139 # /equal/difffiles/difffiles: The local file is a modified
140 # file. Nothing should happen.
142 echo "foo" > $i/equal/difffiles/difffiles/file
144 echo "bar" > $TEST/equal/difffiles/difffiles/file
150 echo "foo" > $i/first/equal/second/file
154 echo "foo" > $i/first/equal/second/fulldir/file
157 # /first/equal/*: Cannot occur. If the file is missing from
163 echo "foo" > $OLD/first/first/equal/file
170 # /first/second/*: Cannot happen, if the file is in old for
173 # /first/difftype/second: File with different local type
178 # /first/difftype/*: Cannot happen since the file is missing
186 # /first/difflinks/*: Cannot happen since the file is missing
189 # /first/difffiles/second: Modified file removed. Should
191 echo "foo" > $OLD/first/difffiles/second/file
192 echo "bar" > $TEST/first/difffiles/second/file
194 # /first/difffiles/*: Cannot happen since the file is missing
197 # /second/equal/first: Added a new file that isn't present in
199 echo "bar" > $NEW/second/equal/first/file
204 echo "foo" > $NEW/second/equal/first/fulldir/file
206 # /second/equal/*: Cannot happen since the file is missing
209 # /second/first/*: Cannot happen since the file is missing
212 # /second/second/equal: Newly added file is already present in
213 # the test directory and identical to the new file. Nothing
217 echo "foo" > $i/second/second/equal/file
222 # /second/second/first: Cannot happen. The file is in dest in
225 # /second/second/second: Cannot happen. The file is in new in
228 # /second/second/difftype: Newly added file conflicts with
229 # existing file in test tree of a different type. Should
239 # /second/second/difffiles: Newly added file conflicts with
240 # existing file in test tree. Should generate a warning.
241 echo "new" > $NEW/second/second/difffiles/file
242 echo "test" > $TEST/second/second/difffiles/file
244 # /second/difftype/*: Cannot happen since the file is missing
247 # /second/difflinks/*: Cannot happen since the file is missing
250 # /second/difffiles/*: Cannot happen since the file is missing
253 # /difftype/equal/difftype: Unmodified file has changed type.
254 # File should be updated to the new file. In the 'todir' case
257 echo "foo" > $i/difftype/equal/difftype/file
261 ln -s "test" $NEW/difftype/equal/difftype/file
265 # /difftype/equal/*: Cannot happen. Since the old file is a
266 # difftype from the new file and the test file is identical to
267 # the old file, the test file must be a difftype from the new
268 # file.
270 # /difftype/first/first: A removed file has changed type.
275 # /difftype/first/*: Cannot happen. Since the new file exists
276 # and the dest file is missing, the last test must be 'first'.
278 # /difftype/second/*: Cannot happen. The old file exists in
281 # /difftype/difftype/equal: A file has changed type, but the
282 # file in the test directory already matches the new file. Do
285 mkfifo $OLD/difftype/difftype/equal/file
288 echo "bar" > $i/difftype/difftype/equal/file
291 # /difftype/difftype/first: Cannot happen. The dest file
294 # /difftype/difftype/second: Cannot happen. The new file
307 # /difftype/difftype/difflinks: A file has changed from a
315 # /difftype/difftype/difffile: A file has changed from a
316 # non-regular file to a regular file in both the new and test
318 # This should generate a new file conflict.
319 ln -s "old" $OLD/difftype/difftype/difffiles/file
320 echo "foo" > $NEW/difftype/difftype/difffiles/file
321 echo "bar" > $TEST/difftype/difftype/difffiles/file
338 # /difflinks/first/*: Cannot happen. Since the test file is
347 # changed to a different file type in the test tree. This
354 # are both links and the test file is not a link, so the third
376 # /difflinks/difffiles/*: Cannot happen. The old file is a
377 # link in the first test, so it cannot be a regular file in
380 # /difffiles/equal/difffiles: An unmodified file has been
381 # changed in new tree. The file should be updated to the new
384 echo "foo" > $i/difffiles/equal/difffiles/file
386 echo "bar" > $NEW/difffiles/equal/difffiles/file
388 # /difffiles/equal/*: Cannot happen. Since the old file is
389 # identical to the test file, the third test must be
392 # /difffiles/first/first: A removed file has been changed in
394 echo "foo" > $OLD/difffiles/first/first/file
395 echo "bar" > $NEW/difffiles/first/first/file
397 # /difffiles/first/*: Cannot happen. The new file is a
398 # regular file from the first test and the test file is
402 # /difffiles/second/*: Cannot happen. The old file is present
405 # /difffiles/difftype/difftype: An updated regular file has
406 # been changed to a different file type in the test tree.
408 echo "old" > $OLD/difffiles/difftype/difftype/file
409 echo "new" > $NEW/difffiles/difftype/difftype/file
410 mkfifo $TEST/difffiles/difftype/difftype/file
412 # /difffiles/difftype/*: Cannot happen. The new file is known
413 # to be a regular file from the first test, and the test file
414 # is known to exist as a different file type from the second
417 # /difffiles/difflink/*: Cannot happen. The old file is known
418 # to be a regular file from the first test, so it cannot be a
421 # /difffiles/difffiles/equal: An updated regular file has
422 # already been updated to match the new file in the test tree.
424 echo "foo" > $OLD/difffiles/difffiles/equal/file
426 echo "bar" > $i/difffiles/difffiles/equal/file
429 # /difffiles/difffiles/difffiles: A modified regular file was
431 # to the new file if possible. If the merge fails, a conflict
447 this is an old file
450 this is a new file
453 this is a test file
457 # tests, all three files are regular files. The test file can
458 # either be identical to the new file ('equal') or not
464 # /adddir/conflict: Add a new file in a directory that already
465 # exists as a file. This should generate two warnings.
470 # /adddir/partial: Add a new file in a directory. The
472 # different local file. The new file from the new tree should
477 echo "foo" > $NEW/adddir/partial/file
483 # /rmdir/extra: Do not remove a directory with an extra local file.
491 # remove file. This should generate a warning.
504 echo "foo" > $OLD/rmdir/partial/subdir/file
514 # file without conflicts where the test tree already has the
515 # new file. Nothing should happen.
522 # /dirchange/already/todir: Convert an unmodified file to a
531 # /dirchange/old/fromdir: Convert a directory tree to a file.
539 # /dirchange/old/todir: Convert a file to a directory tree.
540 # The old file is unmodified and should be changed to the new
546 echo "bar" > $NEW/dirchange/old/todir/file
549 # file. The test tree includes an extra file in the directory
554 echo "foo" > $i/dirchange/fromdir/extradir/file
560 # file. The test tree includes a local change that generates
569 # /dirchange/todir/difffile: Convert a file to a directory
571 # file so that the conversion fails with a warning.
574 echo "baz" > $NEW/dirchange/todir/difffile/file
578 # the conflict is due to a change in the file type.
581 echo "baz" > $NEW/dirchange/todir/difftype/file
651 # $1 - relative path to file that should be missing from TEST
655 echo "File $1 should be missing"
660 # $1 - relative path to file that should be present in TEST
664 echo "File $1 should be present"
669 # $1 - relative path to file that should be a fifo in TEST
673 echo "File $1 should be a FIFO"
678 # $1 - relative path to file that should be a directory in TEST
682 echo "File $1 should be a directory"
687 # $1 - relative path to file that should be a symlink in TEST
694 echo "File $1 should be a link"
705 # $1 - relative path to regular file that should be present in TEST
706 # $2 - optional string that should match file contents
708 file() function
713 echo "File $1 should be a regular file"
718 echo "File $1 has wrong contents"
724 echo "File $1 has wrong contents"
730 # $1 - relative path to a regular file that should have a conflict
731 # $2 - optional MD5 of the conflict file contents
737 echo "File $1 missing conflict"
755 file /equal/equal/equal/file "foo"
761 missing /equal/first/first/file
766 file /equal/difftype/difftype/fifo "bar"
773 file /equal/difffiles/difffiles/file "bar"
777 missing /first/equal/second/file
784 missing /first/first/equal/file
795 file /first/difffiles/second/file "bar"
798 file /second/equal/first/file "bar"
802 file /second/equal/first/fulldir/file "foo"
806 file /second/second/equal/file "foo"
817 file /second/second/difffiles/file "test"
818 conflict /second/second/difffiles/file 4f2ee8620a251fd53f06bb6112eb6ffa
821 link /difftype/equal/difftype/file "test"
830 file /difftype/difftype/equal/file "bar"
833 file /difftype/difftype/difftype/one "foo"
840 conflict /difftype/difftype/difffiles/file \
850 file /difflinks/difftype/difftype/link "test"
859 file /difffiles/equal/difffiles/file "bar"
862 missing /difffiles/first/first/file
865 fifo /difffiles/difftype/difftype/file
868 file /difffiles/difffiles/equal/file "bar"
871 file /difffiles/difffiles/difffiles/simple "" \
873 file /difffiles/difffiles/difffiles/conflict "this is a test file"
878 file /adddir/conflict
881 file /adddir/partial/file "foo"
886 file /rmdir/extra/localfile.txt "foo"
896 file /dirchange/already/fromdir "bar"
899 file /dirchange/already/todir/somefile "blah"
902 file /dirchange/old/fromdir "bar"
905 file /dirchange/old/todir/file "bar"
908 missing /dirchange/fromdir/extradir/file
912 file /dirchange/fromdir/conflict/somefile "bar"
915 file /dirchange/todir/difffile "bar"
921 file /etc/master.passwd
922 file /etc/passwd
923 file /etc/pwd.db
924 file /etc/spwd.db
925 file /etc/login.conf "" 7774a0f9a3a372c7c109c32fd31c4b6b
926 file /etc/login.conf.db
927 file /etc/mail/aliases "" 7d598f89ec040ab56af54011bdb83337
928 file /etc/services "" 37fb6a8d1273f3b78329d431f21d9c7d
929 file /var/db/services.db
946 D /dirchange/fromdir/extradir/file
949 D /first/equal/second/file
950 D /first/equal/second/fulldir/file
959 U /difffiles/equal/difffiles/file
961 C /difftype/difftype/difffiles/file
962 U /difftype/equal/difftype/file
970 A /adddir/partial/file
971 A /dirchange/old/todir/file
974 A /second/equal/first/file
975 A /second/equal/first/fulldir/file
977 C /second/second/difffiles/file
979 Modified regular file remains: /dirchange/fromdir/conflict/somefile
980 Modified regular file remains: /first/difffiles/second/file
986 Modified mismatch: /difffiles/difftype/difftype/file (regular file vs fifo file)
987 Removed file changed: /difffiles/first/first/file
989 Modified mismatch: /difflinks/difftype/difftype/link (symbolic link vs regular file)
992 Modified regular file changed: /difftype/difftype/difftype/one (fifo file became directory)
993 Modified symbolic link changed: /difftype/difftype/difftype/two (directory became regular file)
994 Remove mismatch: /difftype/first/first/fifo (fifo file became directory)
995 Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
997 Modified regular file changed: /dirchange/todir/difffile (regular file became directory)
998 Modified fifo file changed: /dirchange/todir/difftype (regular file became directory)
999 New file mismatch: /adddir/conflict (directory vs regular file)
1000 Directory mismatch: $TEST/adddir/conflict (regular file)
1001 Directory mismatch: $TEST/dirchange/todir/difffile (regular file)
1002 Directory mismatch: $TEST/dirchange/todir/difftype (fifo file)
1004 New file mismatch: /second/second/difftype/dir (directory vs fifo file)