Lines Matching full:new

63 NEW=$WORKDIR/current
75 	rm -rf $OLD $NEW $TEST $CONFLICTS
80 				mkdir -p $OLD/$i/$j/$k $NEW/$i/$j/$k \
112 	mkdir $NEW/second/second/difftype/dir
117 	ln -s "new link" $NEW/second/second/difflinks/link
122 	echo "new" > $NEW/second/second/difffiles/file
128 	mkdir $NEW/difftype/first/first/fifo
130 	# /difftype/difftype/difftype: All three files (old, new, and
134 	mkdir $NEW/difftype/difftype/difftype/one
137 	echo "baz" > $NEW/difftype/difftype/difftype/two
141 	# non-link to a link in both the new and test trees, but the
142 	# target of the new and test links differ.  This should
143 	# generate a new link conflict.
145 	ln -s "new" $NEW/difftype/difftype/difflinks/link
149 	# non-regular file to a regular file in both the new and test
150 	# trees, but the contents in the new and test files differ.
151 	# This should generate a new file conflict.
153 	echo "foo" > $NEW/difftype/difftype/difffiles/file
159 	ln -s "new" $NEW/difflinks/first/first/link
165 	ln -s "new" $NEW/difflinks/difftype/difftype/link
170 	# or new links.  This should generate a warning.
172 	ln -s "new" $NEW/difflinks/difflinks/difflinks/link
176 	# the new tree.  This should generate a warning.
178 	echo "bar" > $NEW/difffiles/first/first/file
184 	echo "new" > $NEW/difffiles/difftype/difftype/file
188 	# updated in the new tree.  The changes should be merged into
189 	# to the new file if possible.  If the merge fails, a conflict
195 	cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
196 this is a new file
203 	mkdir -p $OLD/adddir $NEW/adddir $TEST/adddir
205 	# /adddir/conflict: Add a new file in a directory that already
207 	mkdir $NEW/adddir/conflict
208 	touch $NEW/adddir/conflict/newfile
212 	mkdir -p $OLD/rmdir $NEW/rmdir $TEST/rmdir
230 	for i in $OLD $NEW $TEST; do
245 	ln -s "bar" $NEW/dirchange/fromdir/extradir
255 	mkfifo $NEW/dirchange/fromdir/conflict
261 	mkdir $NEW/dirchange/todir/difffile
262 	echo "baz" > $NEW/dirchange/todir/difffile/file
268 	mkdir $NEW/dirchange/todir/difftype
269 	echo "baz" > $NEW/dirchange/todir/difftype/file
409   Modified link changed: /difflinks/difflinks/difflinks/link ("old" became "new")
411   Removed link changed: /difflinks/first/first/link ("old" became "new")
412   New link conflict: /difftype/difftype/difflinks/link ("new" vs "test")
420   New file mismatch: /adddir/conflict (directory vs regular file)
424   New link conflict: /second/second/difflinks/link ("new link" vs "test link")
425   New file mismatch: /second/second/difftype/dir (directory vs fifo file)
566 link /second/second/difflinks/link "new link"
569 file /second/second/difffiles/file "new"
580 link /difftype/difftype/difflinks/link "new"
587 link /difflinks/first/first/link "new"
590 link /difflinks/difftype/difftype/link "new"
593 link /difflinks/difflinks/difflinks/link "new"
599 file /difffiles/difftype/difftype/file "new"
603 file /difffiles/difffiles/difffiles/conflict "this is a new file"