Lines Matching refs:conflict
132 # conflict: Modify a file where the local file has a different
133 # FreeBSD ID string. This should still generate a conflict
135 store_id $OLD/conflict ": head/conflict 12000 jhb "
136 store_id $NEW/conflict ": head/conflict 12345 jhb "
137 store_id $TEST/conflict ""
138 cat >> $OLD/conflict <<EOF
142 cat >> $NEW/conflict <<EOF
146 cat >> $TEST/conflict <<EOF
255 # $1 - relative path to a regular file that should have a conflict
256 # $2 - optional MD5 of the conflict file contents
257 conflict()
262 echo "File $1 missing conflict"
273 # $1 - relative path to a regular file that should not have a conflict
277 echo "File $1 should not have a conflict"
299 C /conflict
315 conflict /old 8441be64a1540f2ff584015279682425
317 conflict /already f44105abb1fa3293e95c5d77e428d418
319 conflict /add f99081e0da9a07f3cfebb430c0414941
320 file /conflict "" dc27978df125b0daeb7d9b93265f03fd
321 conflict /conflict 868452f666fea1c60ffb918ad9ad9607
323 conflict /local 3df93e64043c8e348fc625b93ea220f4
336 C /conflict
353 file /conflict "" dc27978df125b0daeb7d9b93265f03fd
354 conflict /conflict 868452f666fea1c60ffb918ad9ad9607
369 U /conflict
388 file /conflict "" 75ee141c4136beaf14e39de92efa84e4
389 noconflict /conflict