Lines Matching full:new
63 NEW=$WORKDIR/current
73 rm -rf $OLD $NEW $TEST $CONFLICTS
74 mkdir -p $OLD/etc $NEW/etc $TEST/etc
77 # relations between the three threes (old, new, and test): old
78 # vs new, old vs test, and new vs test. Each of these
89 # Note that if the old and new files are identical (so first
94 # present in at least one of the old or new trees. Thus, none
100 mkdir -p $OLD/$i/$j/$k $NEW/$i/$j/$k \
107 for i in $OLD $NEW $TEST; do
116 for i in $OLD $NEW; do
125 for i in $OLD $NEW; do
134 for i in $OLD $NEW; do
141 for i in $OLD $NEW; do
158 # new, then new vs test will always be 'second'.
168 # both new and test.
171 # old vs new, it cannot be missing for old vs test.
179 # from new but present in test.
187 # from new but present in test.
195 # from new but present in test.
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
207 # from test but present in new.
213 # the test directory and identical to the new file. Nothing
215 for i in $NEW $TEST; do
225 # /second/second/second: Cannot happen. The file is in new in
231 mkdir $NEW/second/second/difftype/dir
236 ln -s "new link" $NEW/second/second/difflinks/link
241 echo "new" > $NEW/second/second/difffiles/file
254 # File should be updated to the new file. In the 'todir' case
261 ln -s "test" $NEW/difftype/equal/difftype/file
262 mkfifo $NEW/difftype/equal/difftype/fromdir
263 mkdir $NEW/difftype/equal/difftype/todir
266 # difftype from the new file and the test file is identical to
267 # the old file, the test file must be a difftype from the new
273 mkdir $NEW/difftype/first/first/fifo
275 # /difftype/first/*: Cannot happen. Since the new file exists
282 # file in the test directory already matches the new file. Do
286 for i in $NEW $TEST; do
294 # /difftype/difftype/second: Cannot happen. The new file
297 # /difftype/difftype/difftype: All three files (old, new, and
301 mkdir $NEW/difftype/difftype/difftype/one
304 echo "baz" > $NEW/difftype/difftype/difftype/two
308 # non-link to a link in both the new and test trees, but the
309 # target of the new and test links differ. This should
310 # generate a new link conflict.
312 ln -s "new" $NEW/difftype/difftype/difflinks/link
316 # non-regular file to a regular file in both the new and test
317 # trees, but the contents in the new and test files differ.
318 # This should generate a new file conflict.
320 echo "foo" > $NEW/difftype/difftype/difffiles/file
328 ln -s "new" $NEW/difflinks/equal/difflinks/link
336 ln -s "new" $NEW/difflinks/first/first/link
350 ln -s "new" $NEW/difflinks/difftype/difftype/link
353 # /difflinks/difftype/*: Cannot happen. The old and new files
358 # updated to the new target in the test tree. Nothing should
361 for i in $NEW $TEST; do
362 ln -s "new" $i/difflinks/difflinks/equal/link
367 # or new links. This should generate a warning.
369 ln -s "new" $NEW/difflinks/difflinks/difflinks/link
381 # changed in new tree. The file should be updated to the new
386 echo "bar" > $NEW/difffiles/equal/difffiles/file
393 # the new tree. This should generate a warning.
395 echo "bar" > $NEW/difffiles/first/first/file
397 # /difffiles/first/*: Cannot happen. The new file is a
409 echo "new" > $NEW/difffiles/difftype/difftype/file
412 # /difffiles/difftype/*: Cannot happen. The new file is known
422 # already been updated to match the new file in the test tree.
425 for i in $NEW $TEST; do
430 # updated in the new tree. The changes should be merged into
431 # to the new file if possible. If the merge fails, a conflict
437 cat > $NEW/difffiles/difffiles/difffiles/simple <<EOF
438 this is a new line
449 cat > $NEW/difffiles/difffiles/difffiles/conflict <<EOF
450 this is a new file
458 # either be identical to the new file ('equal') or not
462 mkdir -p $OLD/adddir $NEW/adddir $TEST/adddir
464 # /adddir/conflict: Add a new file in a directory that already
466 mkdir $NEW/adddir/conflict
467 touch $NEW/adddir/conflict/newfile
470 # /adddir/partial: Add a new file in a directory. The
472 # different local file. The new file from the new tree should
474 for i in $NEW $TEST; do
477 echo "foo" > $NEW/adddir/partial/file
481 mkdir -p $OLD/rmdir $NEW/rmdir $TEST/rmdir
507 for i in $OLD $NEW $TEST; do
515 # new file. Nothing should happen.
518 for i in $NEW $TEST; do
523 # directory tree where the test tree already has the new
526 for i in $NEW $TEST; do
532 # The old files are unmodified and should be changed to the new tree.
537 echo "bar" > $NEW/dirchange/old/fromdir
540 # The old file is unmodified and should be changed to the new
545 mkdir $NEW/dirchange/old/todir
546 echo "bar" > $NEW/dirchange/old/todir/file
557 ln -s "bar" $NEW/dirchange/fromdir/extradir
567 mkfifo $NEW/dirchange/fromdir/conflict
573 mkdir $NEW/dirchange/todir/difffile
574 echo "baz" > $NEW/dirchange/todir/difffile/file
580 mkdir $NEW/dirchange/todir/difftype
581 echo "baz" > $NEW/dirchange/todir/difftype/file
588 $NEW/etc/master.passwd
596 cat > $NEW/etc/login.conf <<EOF
605 mkdir -p $OLD/etc/mail $NEW/etc/mail $TEST/etc/mail
613 cat > $NEW/etc/mail/aliases <<EOF
639 cat > $NEW/etc/services <<EOF
800 link /second/equal/first/link "new"
844 link /difflinks/equal/difflinks/link "new"
853 link /difflinks/difflinks/equal/link "new"
988 Modified link changed: /difflinks/difflinks/difflinks/link ("old" became "new")
990 Removed link changed: /difflinks/first/first/link ("old" became "new")
991 New link conflict: /difftype/difftype/difflinks/link ("new" vs "test")
999 New file mismatch: /adddir/conflict (directory vs regular file)
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)