Lines Matching full:old
62 OLD=$WORKDIR/old
86 rm -rf $OLD $NEW $TEST $CONFLICTS
87 mkdir -p $OLD $NEW $TEST
91 store_id $OLD/remove
94 # old: Modify a file where the only local difference between
95 # the old and test files is a change in the FreeBSD ID string.
96 store_id $OLD/old ": src/old,v 1.1 jhb Exp "
97 store_id $NEW/old ": head/old 12345 jhb "
98 store_id $TEST/old ": head/old 12000 jhb "
99 for i in $OLD $TEST; do
100 cat >> $i/old <<EOF
102 an old file
105 cat >> $NEW/old <<EOF
112 store_id $OLD/already ": src/already,v 1.1 jhb Exp "
115 cat >> $OLD/already <<EOF
117 another old file
134 store_id $OLD/conflict ": head/conflict 12000 jhb "
137 cat >> $OLD/conflict <<EOF
139 this is the old file
151 # FreeBSD ID string and the only differences between the old
154 for i in $OLD $NEW $TEST; do
161 store_id $OLD/local ": head/local 12000 jhb "
165 for i in $OLD $NEW $TEST; do
179 # only differences between the old and new versions are a
182 store_id $OLD/local-already ": head/local 12000 jhb "
187 for i in $OLD $NEW $TEST; do
201 store_id $OLD/local-remove ": head/local-remove 12000 jhb "
203 for i in $OLD $NEW; do
301 C /old
313 file /old "" 2f799a7addc4132563ef9b44adc66157
314 conflict /old 8441be64a1540f2ff584015279682425
337 U /old
346 file /old "" 6a9f34f109d94406a4de3bc5d72de259
347 noconflict /old
372 U /old
381 file /old "" 6a9f34f109d94406a4de3bc5d72de259
382 noconflict /old