Lines Matching full:file
66 # The various states of the comparison of a file between two trees.
90 # are: 1) it should not force the removal of a modified file
92 # modified or added file.
94 # /first/difftype/second: File with different local type
104 # /first/difffiles/second: Modified file removed. Should
106 echo "foo" > $OLD/first/difffiles/second/file
107 echo "bar" > $TEST/first/difffiles/second/file
109 # /second/second/difftype: Newly added file conflicts with
110 # existing file in test tree of a different type. Should
120 # /second/second/difffiles: Newly added file conflicts with
121 # existing file in test tree. Should generate a warning.
122 echo "new" > $NEW/second/second/difffiles/file
123 echo "test" > $TEST/second/second/difffiles/file
125 # /difftype/first/first: A removed file has changed type.
140 # /difftype/difftype/difflinks: A file has changed from a
148 # /difftype/difftype/difffile: A file has changed from a
149 # non-regular file to a regular file in both the new and test
151 # This should generate a new file conflict.
152 ln -s "old" $OLD/difftype/difftype/difffiles/file
153 echo "foo" > $NEW/difftype/difftype/difffiles/file
154 echo "bar" > $TEST/difftype/difftype/difffiles/file
162 # changed to a different file type in the test tree. This
175 # /difffiles/first/first: A removed file has been changed in
177 echo "foo" > $OLD/difffiles/first/first/file
178 echo "bar" > $NEW/difffiles/first/first/file
180 # /difffiles/difftype/difftype: An updated regular file has
181 # been changed to a different file type in the test tree.
183 echo "old" > $OLD/difffiles/difftype/difftype/file
184 echo "new" > $NEW/difffiles/difftype/difftype/file
185 mkfifo $TEST/difffiles/difftype/difftype/file
187 # /difffiles/difffiles/difffiles: A modified regular file was
189 # to the new file if possible. If the merge fails, a conflict
193 this is an old file
196 this is a new file
199 this is a test file
205 # /adddir/conflict: Add a new file in a directory that already
206 # exists as a file. This should generate two warnings.
214 # /rmdir/extra: Do not remove a directory with an extra local file.
222 # remove file. This should generate a warning.
237 # file. The test tree includes an extra file in the directory
242 echo "foo" > $i/dirchange/fromdir/extradir/file
248 # file. The test tree includes a local change that generates
257 # /dirchange/todir/difffile: Convert a file to a directory
259 # file so that the conversion fails with a warning.
262 echo "baz" > $NEW/dirchange/todir/difffile/file
266 # the conflict is due to a change in the file type.
269 echo "baz" > $NEW/dirchange/todir/difftype/file
273 # $1 - relative path to file that should be missing from TEST
277 echo "File $1 should be missing"
282 # $1 - relative path to file that should be present in TEST
286 echo "File $1 should be present"
291 # $1 - relative path to file that should be a fifo in TEST
295 echo "File $1 should be a FIFO"
300 # $1 - relative path to file that should be a directory in TEST
304 echo "File $1 should be a directory"
309 # $1 - relative path to file that should be a symlink in TEST
316 echo "File $1 should be a link"
327 # $1 - relative path to regular file that should be present in TEST
328 # $2 - optional string that should match file contents
330 file() function
335 echo "File $1 should be a regular file"
340 echo "File $1 has wrong contents"
346 echo "File $1 has wrong contents"
352 # $1 - relative path to a regular file that should have a conflict
353 # $2 - optional MD5 of the conflict file contents
359 echo "File $1 missing conflict"
370 # $1 - relative path to a regular file that should not have a conflict
374 echo "File $1 should not have a conflict"
395 D /dirchange/fromdir/extradir/file
397 C /difftype/difftype/difffiles/file
398 C /second/second/difffiles/file
400 Modified regular file remains: /dirchange/fromdir/conflict/somefile
401 Modified regular file remains: /first/difffiles/second/file
407 Modified mismatch: /difffiles/difftype/difftype/file (regular file vs fifo file)
408 Removed file changed: /difffiles/first/first/file
410 Modified mismatch: /difflinks/difftype/difftype/link (symbolic link vs regular file)
413 Modified regular file changed: /difftype/difftype/difftype/one (fifo file became directory)
414 Modified symbolic link changed: /difftype/difftype/difftype/two (directory became regular file)
415 Remove mismatch: /difftype/first/first/fifo (fifo file became directory)
416 Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
418 Modified regular file changed: /dirchange/todir/difffile (regular file became directory)
419 Modified fifo file changed: /dirchange/todir/difftype (regular file became directory)
420 New file mismatch: /adddir/conflict (directory vs regular file)
421 Directory mismatch: $TEST/adddir/conflict (regular file)
422 Directory mismatch: $TEST/dirchange/todir/difffile (regular file)
423 Directory mismatch: $TEST/dirchange/todir/difftype (fifo file)
425 New file mismatch: /second/second/difftype/dir (directory vs fifo file)
439 file /first/difffiles/second/file "bar"
448 file /second/second/difffiles/file "test"
449 conflict /second/second/difffiles/file 4f2ee8620a251fd53f06bb6112eb6ffa
455 file /difftype/difftype/difftype/one "foo"
462 conflict /difftype/difftype/difffiles/file 117f2bcd1f6491f6044e79e5a57a9229
468 file /difflinks/difftype/difftype/link "test"
474 missing /difffiles/first/first/file
477 fifo /difffiles/difftype/difftype/file
480 file /difffiles/difffiles/difffiles/conflict "this is a test file"
485 file /adddir/conflict
489 file /rmdir/extra/localfile.txt "foo"
496 missing /dirchange/fromdir/extradir/file
500 file /dirchange/fromdir/conflict/somefile "bar"
503 file /dirchange/todir/difffile "bar"
517 D /dirchange/fromdir/extradir/file
519 U /difffiles/difftype/difftype/file
520 A /difffiles/first/first/file
524 U /difftype/difftype/difffiles/file
532 A /dirchange/todir/difffile/file
533 A /dirchange/todir/difftype/file
534 U /second/second/difffiles/file
538 Modified regular file remains: /dirchange/fromdir/conflict/somefile
539 Modified regular file remains: /first/difffiles/second/file
545 Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
560 file /first/difffiles/second/file "bar"
569 file /second/second/difffiles/file "new"
570 noconflict /second/second/difffiles/file
577 file /difftype/difftype/difftype/two "baz"
583 noconflict /difftype/difftype/difffiles/file
584 file /difftype/difftype/difffiles/file "foo"
596 file /difffiles/first/first/file "bar"
599 file /difffiles/difftype/difftype/file "new"
603 file /difffiles/difffiles/difffiles/conflict "this is a new file"
606 file /adddir/conflict/newfile
610 file /rmdir/extra/localfile.txt "foo"
617 missing /dirchange/fromdir/extradir/file
621 file /dirchange/fromdir/conflict/somefile "bar"
624 file /dirchange/todir/difffile/file "baz"
627 file /dirchange/todir/difftype/file "baz"