Lines Matching defs:file
62 # The various states of the comparison of a file between two trees.
86 # are: 1) it should not force the removal of a modified file
88 # modified or added file.
100 # /first/difffiles/second: Modified file removed. Should
102 echo "foo" > $OLD/first/difffiles/second/file
103 echo "bar" > $TEST/first/difffiles/second/file
105 # /second/second/difftype: Newly added file conflicts with
106 # existing file in test tree of a different type. Should
116 # /second/second/difffiles: Newly added file conflicts with
117 # existing file in test tree. Should generate a warning.
118 echo "new" > $NEW/second/second/difffiles/file
119 echo "test" > $TEST/second/second/difffiles/file
121 # /difftype/first/first: A removed file has changed type.
136 # /difftype/difftype/difflinks: A file has changed from a
144 # /difftype/difftype/difffile: A file has changed from a
145 # non-regular file to a regular file in both the new and test
147 # This should generate a new file conflict.
148 ln -s "old" $OLD/difftype/difftype/difffiles/file
149 echo "foo" > $NEW/difftype/difftype/difffiles/file
150 echo "bar" > $TEST/difftype/difftype/difffiles/file
158 # changed to a different file type in the test tree. This
171 # /difffiles/first/first: A removed file has been changed in
173 echo "foo" > $OLD/difffiles/first/first/file
174 echo "bar" > $NEW/difffiles/first/first/file
176 # /difffiles/difftype/difftype: An updated regular file has
177 # been changed to a different file type in the test tree.
179 echo "old" > $OLD/difffiles/difftype/difftype/file
180 echo "new" > $NEW/difffiles/difftype/difftype/file
181 mkfifo $TEST/difffiles/difftype/difftype/file
183 # /difffiles/difffiles/difffiles: A modified regular file was
185 # to the new file if possible. If the merge fails, a conflict
189 this is an old file
192 this is a new file
195 this is a test file
201 # /adddir/conflict: Add a new file in a directory that already
202 # exists as a file. This should generate two warnings.
210 # /rmdir/extra: Do not remove a directory with an extra local file.
218 # remove file. This should generate a warning.
233 # file. The test tree includes an extra file in the directory
238 echo "foo" > $i/dirchange/fromdir/extradir/file
244 # file. The test tree includes a local change that generates
253 # /dirchange/todir/difffile: Convert a file to a directory
255 # file so that the conversion fails with a warning.
258 echo "baz" > $NEW/dirchange/todir/difffile/file
262 # the conflict is due to a change in the file type.
265 echo "baz" > $NEW/dirchange/todir/difftype/file
269 # $1 - relative path to file that should be missing from TEST
277 # $1 - relative path to file that should be present in TEST
285 # $1 - relative path to file that should be a fifo in TEST
293 # $1 - relative path to file that should be a directory in TEST
301 # $1 - relative path to file that should be a symlink in TEST
317 # $1 - relative path to regular file that should be present in TEST
318 # $2 - optional string that should match file contents
320 file()
325 echo "File $1 should be a regular file"
339 # $1 - relative path to a regular file that should have a conflict
340 # $2 - optional MD5 of the conflict file contents
355 # $1 - relative path to a regular file that should not have a conflict
378 D /dirchange/fromdir/extradir/file
380 C /difftype/difftype/difffiles/file
381 C /second/second/difffiles/file
383 Modified regular file remains: /dirchange/fromdir/conflict/somefile
384 Modified regular file remains: /first/difffiles/second/file
390 Modified mismatch: /difffiles/difftype/difftype/file (regular file vs fifo file)
391 Removed file changed: /difffiles/first/first/file
393 Modified mismatch: /difflinks/difftype/difftype/link (symbolic link vs regular file)
396 Modified regular file changed: /difftype/difftype/difftype/one (fifo file became directory)
397 Modified symbolic link changed: /difftype/difftype/difftype/two (directory became regular file)
398 Remove mismatch: /difftype/first/first/fifo (fifo file became directory)
399 Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
401 Modified regular file changed: /dirchange/todir/difffile (regular file became directory)
402 Modified fifo file changed: /dirchange/todir/difftype (regular file became directory)
403 New file mismatch: /adddir/conflict (directory vs regular file)
404 Directory mismatch: $TEST/adddir/conflict (regular file)
405 Directory mismatch: $TEST/dirchange/todir/difffile (regular file)
406 Directory mismatch: $TEST/dirchange/todir/difftype (fifo file)
408 New file mismatch: /second/second/difftype/dir (directory vs fifo file)
421 file /first/difffiles/second/file "bar"
430 file /second/second/difffiles/file "test"
431 conflict /second/second/difffiles/file 4f2ee8620a251fd53f06bb6112eb6ffa
437 file /difftype/difftype/difftype/one "foo"
444 conflict /difftype/difftype/difffiles/file 117f2bcd1f6491f6044e79e5a57a9229
450 file /difflinks/difftype/difftype/link "test"
456 missing /difffiles/first/first/file
459 fifo /difffiles/difftype/difftype/file
462 file /difffiles/difffiles/difffiles/conflict "this is a test file"
467 file /adddir/conflict
471 file /rmdir/extra/localfile.txt "foo"
478 missing /dirchange/fromdir/extradir/file
482 file /dirchange/fromdir/conflict/somefile "bar"
485 file /dirchange/todir/difffile "bar"
499 D /dirchange/fromdir/extradir/file
501 U /difffiles/difftype/difftype/file
502 A /difffiles/first/first/file
506 U /difftype/difftype/difffiles/file
514 A /dirchange/todir/difffile/file
515 A /dirchange/todir/difftype/file
516 U /second/second/difffiles/file
520 Modified regular file remains: /dirchange/fromdir/conflict/somefile
521 Modified regular file remains: /first/difffiles/second/file
527 Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
541 file /first/difffiles/second/file "bar"
550 file /second/second/difffiles/file "new"
551 noconflict /second/second/difffiles/file
558 file /difftype/difftype/difftype/two "baz"
564 noconflict /difftype/difftype/difffiles/file
565 file /difftype/difftype/difffiles/file "foo"
577 file /difffiles/first/first/file "bar"
580 file /difffiles/difftype/difftype/file "new"
584 file /difffiles/difffiles/difffiles/conflict "this is a new file"
587 file /adddir/conflict/newfile
591 file /rmdir/extra/localfile.txt "foo"
598 missing /dirchange/fromdir/extradir/file
602 file /dirchange/fromdir/conflict/somefile "bar"
605 file /dirchange/todir/difffile/file "baz"
608 file /dirchange/todir/difftype/file "baz"