Lines Matching defs:conflict
131 # conflict: Modify a file where the local file has a different
132 # FreeBSD ID string. This should still generate a conflict
134 store_id $OLD/conflict ": head/conflict 12000 jhb "
135 store_id $NEW/conflict ": head/conflict 12345 jhb "
136 store_id $TEST/conflict ""
137 cat >> $OLD/conflict <<EOF
141 cat >> $NEW/conflict <<EOF
145 cat >> $TEST/conflict <<EOF
249 # $1 - relative path to a regular file that should have a conflict
250 # $2 - optional MD5 of the conflict file contents
251 conflict()
256 echo "File $1 missing conflict"
265 # $1 - relative path to a regular file that should not have a conflict
269 echo "File $1 should not have a conflict"
289 C /conflict
304 conflict /old 8441be64a1540f2ff584015279682425
306 conflict /already f44105abb1fa3293e95c5d77e428d418
308 conflict /add f99081e0da9a07f3cfebb430c0414941
309 file /conflict "" dc27978df125b0daeb7d9b93265f03fd
310 conflict /conflict 868452f666fea1c60ffb918ad9ad9607
312 conflict /local 3df93e64043c8e348fc625b93ea220f4
325 C /conflict
341 file /conflict "" dc27978df125b0daeb7d9b93265f03fd
342 conflict /conflict 868452f666fea1c60ffb918ad9ad9607
357 U /conflict
375 file /conflict "" 75ee141c4136beaf14e39de92efa84e4
376 noconflict /conflict