Lines Matching full:conflict
86 # What follows are the various warning/conflict cases from the
143 # generate a new link conflict.
151 # This should generate a new file conflict.
189 # to the new file if possible. If the merge fails, a conflict
191 # conflict case.
192 cat > $OLD/difffiles/difffiles/difffiles/conflict <<EOF
195 cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
198 cat > $TEST/difffiles/difffiles/difffiles/conflict <<EOF
205 # /adddir/conflict: Add a new file in a directory that already
207 mkdir $NEW/adddir/conflict
208 touch $NEW/adddir/conflict/newfile
209 touch $TEST/adddir/conflict
221 # /rmdir/conflict: Do not remove a directory with a conflicted
224 mkdir $i/rmdir/conflict
226 mkfifo $OLD/rmdir/conflict/difftype
227 mkdir $TEST/rmdir/conflict/difftype
247 # /dirchange/fromdir/conflict: Convert a directory tree to a
251 mkdir $i/dirchange/fromdir/conflict
253 echo "foo" > $OLD/dirchange/fromdir/conflict/somefile
254 echo "bar" > $TEST/dirchange/fromdir/conflict/somefile
255 mkfifo $NEW/dirchange/fromdir/conflict
266 # the conflict is due to a change in the file type.
352 # $1 - relative path to a regular file that should have a conflict
353 # $2 - optional MD5 of the conflict file contents
354 conflict() function
359 echo "File $1 missing conflict"
364 echo "Conflict $1 has wrong contents"
370 # $1 - relative path to a regular file that should not have a conflict
374 echo "File $1 should not have a conflict"
396 C /difffiles/difffiles/difffiles/conflict
400 Modified regular file remains: /dirchange/fromdir/conflict/somefile
404 Modified directory remains: /rmdir/conflict/difftype
406 Non-empty directory remains: /rmdir/conflict
412 New link conflict: /difftype/difftype/difflinks/link ("new" vs "test")
416 Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
420 New file mismatch: /adddir/conflict (directory vs regular file)
421 Directory mismatch: $TEST/adddir/conflict (regular file)
424 New link conflict: /second/second/difflinks/link ("new link" vs "test link")
449 conflict /second/second/difffiles/file 4f2ee8620a251fd53f06bb6112eb6ffa
462 conflict /difftype/difftype/difffiles/file 117f2bcd1f6491f6044e79e5a57a9229
480 file /difffiles/difffiles/difffiles/conflict "this is a test file"
481 conflict /difffiles/difffiles/difffiles/conflict \
484 ## /adddir/conflict:
485 file /adddir/conflict
491 ## /rmdir/conflict:
492 dir /rmdir/conflict/difftype
493 present /rmdir/conflict
499 ## /dirchange/fromdir/conflict:
500 file /dirchange/fromdir/conflict/somefile "bar"
518 U /difffiles/difffiles/difffiles/conflict
530 U /adddir/conflict
531 A /adddir/conflict/newfile
538 Modified regular file remains: /dirchange/fromdir/conflict/somefile
542 Modified directory remains: /rmdir/conflict/difftype
544 Non-empty directory remains: /rmdir/conflict
545 Modified directory changed: /dirchange/fromdir/conflict (directory became fifo file)
602 noconflict /difffiles/difffiles/difffiles/conflict
603 file /difffiles/difffiles/difffiles/conflict "this is a new file"
605 ## /adddir/conflict:
606 file /adddir/conflict/newfile
612 ## /rmdir/conflict:
613 dir /rmdir/conflict/difftype
614 present /rmdir/conflict
620 ## /dirchange/fromdir/conflict:
621 file /dirchange/fromdir/conflict/somefile "bar"