etcupdate/tests/fbsdid_test.sh

111 	# already: Modify a file where the local file already matches
113 	store_id $OLD/already ": src/already,v 1.1 jhb Exp "
114 	store_id $NEW/already ": head/already 12345 jhb "
115 	store_id $TEST/already ": src/already,v 1.2 jhb Exp "
116 	cat >> $OLD/already <<EOF
121 		cat >> $i/already <<EOF
127 	# add: Add a file that already exists where the only local
178 	# local-already: A file with local modifications has the same
183 	store_id $OLD/local-already ": head/local 12000 jhb "
185 		store_id $i/local-already ": head/local 12345 jhb "
189 		cat >> $i/local-already <<EOF
195 	cat >> $TEST/local-already <<EOF
298   C /already
301   M /local-already
316 file /already "" aa53bd506f65d01d766e7ba028585e1d
317 conflict /already f44105abb1fa3293e95c5d77e428d418
324 file /local-already "" 0298b958a603049f45ae6a109c4f7fea
335   U /already
349 file /already "" 21f4eca3aacc702c49878c8da7afd3d0
350 noconflict /already
356 file /local-already "" 0298b958a603049f45ae6a109c4f7fea
368   U /already
371   U /local-already
384 file /already "" 21f4eca3aacc702c49878c8da7afd3d0
385 noconflict /already
391 file /local-already "" 49045f8b51542dd634655301cd296f66