Lines Matching full:local

70 	local file
84 	local i
89 	# remove: Remove a file where the only local difference is a
94 	# old: Modify a file where the only local difference between
110 	# already: Modify a file where the local file already matches
126 	# add: Add a file that already exists where the only local
131 	# conflict: Modify a file where the local file has a different
147 this is the local file
150 	# local: A file with local modifications has a different
155 		cat >> $i/local <<EOF
161 	store_id $OLD/local ": head/local 12000 jhb "
162 	store_id $NEW/local ": head/local 12345 jhb "
163 	store_id $TEST/local ": src/local,v 1.5 jhb Exp "
166 		cat >> $i/local <<EOF
172 	cat >> $TEST/local <<EOF
174 these are some local mods to the file
177 	# local-already: A file with local modifications has the same
182 	store_id $OLD/local-already ": head/local 12000 jhb "
184 		store_id $i/local-already ": head/local 12345 jhb "
188 		cat >> $i/local-already <<EOF
194 	cat >> $TEST/local-already <<EOF
196 these are some local mods to the file
199 	# local-remove: A file removed locally changed it's FreeBSD ID
201 	store_id $OLD/local-remove ": head/local-remove 12000 jhb "
202 	store_id $NEW/local-remove ": head/local-remove 12345 jhb "
204 		cat >> $i/local-remove <<EOF
234 	local contents sum
258 	local sum
299   C /local
300   M /local-already
305   Removed file changed: /local-remove
321 file /local "" aa33e614b5e749449f230e2a2b0072eb
322 conflict /local 3df93e64043c8e348fc625b93ea220f4
323 file /local-already "" 0298b958a603049f45ae6a109c4f7fea
324 missing /local-remove
336   M /local
354 file /local "" 3ed5a35e380c8a93fb5f599d4c052713
355 file /local-already "" 0298b958a603049f45ae6a109c4f7fea
356 missing /local-remove
369   U /local
370   U /local-already
371   A /local-remove
389 file /local "" 6a8fc5c2755b7a49015089f5e1dbe092
390 file /local-already "" 49045f8b51542dd634655301cd296f66
391 file /local-remove "" 5c38322efed4014797d7127f5c652d9d