Lines Matching full:second
67 states="equal first second difftype difflinks difffiles"
94 # /first/difftype/second: File with different local type
96 mkfifo $OLD/first/difftype/second/fifo
97 mkdir $TEST/first/difftype/second/fifo
99 # /first/difflinks/second: Modified link removed. Should
101 ln -s "old link" $OLD/first/difflinks/second/link
102 ln -s "test link" $TEST/first/difflinks/second/link
104 # /first/difffiles/second: Modified file removed. Should
106 echo "foo" > $OLD/first/difffiles/second/file
107 echo "bar" > $TEST/first/difffiles/second/file
109 # /second/second/difftype: Newly added file conflicts with
112 mkdir $NEW/second/second/difftype/dir
113 mkfifo $TEST/second/second/difftype/dir
115 # /second/second/difflinks: Newly added link conflicts with
117 ln -s "new link" $NEW/second/second/difflinks/link
118 ln -s "test link" $TEST/second/second/difflinks/link
120 # /second/second/difffiles: Newly added file conflicts with
122 echo "new" > $NEW/second/second/difffiles/file
123 echo "test" > $TEST/second/second/difffiles/file
398 C /second/second/difffiles/file
401 Modified regular file remains: /first/difffiles/second/file
402 Modified symbolic link remains: /first/difflinks/second/link
403 Modified directory remains: /first/difftype/second/fifo
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)
432 ## /first/difftype/second:
433 present /first/difftype/second/fifo
435 ## /first/difflinks/second:
436 link /first/difflinks/second/link "test link"
438 ## /first/difffiles/second:
439 file /first/difffiles/second/file "bar"
441 ## /second/second/difftype:
442 fifo /second/second/difftype/dir
444 ## /second/second/difflinks:
445 link /second/second/difflinks/link "test link"
447 ## /second/second/difffiles:
448 file /second/second/difffiles/file "test"
449 conflict /second/second/difffiles/file 4f2ee8620a251fd53f06bb6112eb6ffa
508 # Now test with -A '/first*' -A '/second* /*di*'. This should remove
513 $COMMAND -r -A '/first*' -A '/second* /*di*' -d $WORKDIR -D $TEST > \
534 U /second/second/difffiles/file
535 U /second/second/difflinks/link
536 D /second/second/difftype/dir
539 Modified regular file remains: /first/difffiles/second/file
540 Modified symbolic link remains: /first/difflinks/second/link
541 Modified directory remains: /first/difftype/second/fifo
549 echo "Differences for -A '/first*' -A '/second* /*di*':"
553 ## /first/difftype/second:
554 present /first/difftype/second/fifo
556 ## /first/difflinks/second:
557 link /first/difflinks/second/link "test link"
559 ## /first/difffiles/second:
560 file /first/difffiles/second/file "bar"
562 ## /second/second/difftype:
563 missing /second/second/difftype/dir
565 ## /second/second/difflinks:
566 link /second/second/difflinks/link "new link"
568 ## /second/second/difffiles:
569 file /second/second/difffiles/file "new"
570 noconflict /second/second/difffiles/file