Lines Matching full:second

67 states="equal first second difftype difflinks difffiles"
90 # compare is "equal"), then the second and third comparisons
95 # of the '*/second/second' cases are relevant.
146 # /first/equal/second: Remove unmodified files. The files
149 mkfifo $i/first/equal/second/fifo
150 echo "foo" > $i/first/equal/second/file
151 mkdir $i/first/equal/second/emptydir
152 ln -s "bar" $i/first/equal/second/link
153 mkdir $i/first/equal/second/fulldir
154 echo "foo" > $i/first/equal/second/fulldir/file
158 # new, then new vs test will always be 'second'.
170 # /first/second/*: Cannot happen, if the file is in old for
173 # /first/difftype/second: File with different local type
175 mkfifo $OLD/first/difftype/second/fifo
176 mkdir $TEST/first/difftype/second/fifo
181 # /first/difflinks/second: Modified link removed. Should
183 ln -s "old link" $OLD/first/difflinks/second/link
184 ln -s "test link" $TEST/first/difflinks/second/link
189 # /first/difffiles/second: Modified file removed. Should
191 echo "foo" > $OLD/first/difffiles/second/file
192 echo "bar" > $TEST/first/difffiles/second/file
197 # /second/equal/first: Added a new file that isn't present in
199 echo "bar" > $NEW/second/equal/first/file
200 mkfifo $NEW/second/equal/first/fifo
201 ln -s "new" $NEW/second/equal/first/link
202 mkdir $NEW/second/equal/first/emptydir
203 mkdir $NEW/second/equal/first/fulldir
204 echo "foo" > $NEW/second/equal/first/fulldir/file
206 # /second/equal/*: Cannot happen since the file is missing
209 # /second/first/*: Cannot happen since the file is missing
212 # /second/second/equal: Newly added file is already present in
216 mkfifo $i/second/second/equal/fifo
217 echo "foo" > $i/second/second/equal/file
218 mkdir $i/second/second/equal/dir
219 ln -s "bar" $i/second/second/equal/link
222 # /second/second/first: Cannot happen. The file is in dest in
223 # the second test, so it can't be missing from the third test.
225 # /second/second/second: Cannot happen. The file is in new in
228 # /second/second/difftype: Newly added file conflicts with
231 mkdir $NEW/second/second/difftype/dir
232 mkfifo $TEST/second/second/difftype/dir
234 # /second/second/difflinks: Newly added link conflicts with
236 ln -s "new link" $NEW/second/second/difflinks/link
237 ln -s "test link" $TEST/second/second/difflinks/link
239 # /second/second/difffiles: Newly added file conflicts with
241 echo "new" > $NEW/second/second/difffiles/file
242 echo "test" > $TEST/second/second/difffiles/file
244 # /second/difftype/*: Cannot happen since the file is missing
247 # /second/difflinks/*: Cannot happen since the file is missing
250 # /second/difffiles/*: Cannot happen since the file is missing
278 # /difftype/second/*: Cannot happen. The old file exists in
279 # the first test, so it cannot be missing in the second test.
292 # exists in the second test.
294 # /difftype/difftype/second: Cannot happen. The new file
339 # missing in the second test, it must be missing in the third
342 # /difflinks/second/*: Cannot happen. The old link is present
343 # in the first test, so it cannot be missing in the second
378 # the second.
399 # missing in the second test, so the third test must be
402 # /difffiles/second/*: Cannot happen. The old file is present
403 # in the first test, so it must be present in the second test.
414 # is known to exist as a different file type from the second
419 # link in the second test.
775 ## /first/equal/second:
776 missing /first/equal/second/fifo
777 missing /first/equal/second/file
778 missing /first/equal/second/emptydir
779 missing /first/equal/second/link
780 missing /first/equal/second/fulldir
788 ## /first/difftype/second:
789 present /first/difftype/second/fifo
791 ## /first/difflinks/second:
792 link /first/difflinks/second/link "test link"
794 ## /first/difffiles/second:
795 file /first/difffiles/second/file "bar"
797 ## /second/equal/first:
798 file /second/equal/first/file "bar"
799 fifo /second/equal/first/fifo
800 link /second/equal/first/link "new"
801 missing /second/equal/first/emptydir
802 file /second/equal/first/fulldir/file "foo"
804 ## /second/second/equal:
805 fifo /second/second/equal/fifo
806 file /second/second/equal/file "foo"
807 dir /second/second/equal/dir
808 link /second/second/equal/link "bar"
810 ## /second/second/difftype:
811 fifo /second/second/difftype/dir
813 ## /second/second/difflinks:
814 link /second/second/difflinks/link "test link"
816 ## /second/second/difffiles:
817 file /second/second/difffiles/file "test"
818 conflict /second/second/difffiles/file 4f2ee8620a251fd53f06bb6112eb6ffa
948 D /first/equal/second/fifo
949 D /first/equal/second/file
950 D /first/equal/second/fulldir/file
951 D /first/equal/second/link
955 D /first/equal/second/fulldir
956 D /first/equal/second/emptydir
973 A /second/equal/first/fifo
974 A /second/equal/first/file
975 A /second/equal/first/fulldir/file
976 A /second/equal/first/link
977 C /second/second/difffiles/file
980 Modified regular file remains: /first/difffiles/second/file
981 Modified symbolic link remains: /first/difflinks/second/link
982 Modified directory remains: /first/difftype/second/fifo
1003 New link conflict: /second/second/difflinks/link ("new link" vs "test link")
1004 New file mismatch: /second/second/difftype/dir (directory vs fifo file)