DELTA SVN‚l‚n€‚l‚l--- sys/conf/newvers.sh.orig 2020-09-12 08:05:28.983303000 +0000 +++ sys/conf/newvers.sh 2020-09-12 08:06:24.743930000 +0000 @@ -49,7 +49,10 @@ TYPE="FreeBSD" REVISION="12.2" -BRANCH=${BRANCH_OVERRIDE:-BETA1} +BRANCH="BETA1" +if [ -n "${BRANCH_OVERRIDE}" ]; then + BRANCH=${BRANCH_OVERRIDE} +fi RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" ENDREP id: 6-365660.0.r365660/394 type: file count: 0 text: 365660 0 381 364 3b0054762de9575760cd9b62d9aac40d 884cedb6170af79942f5d08b50f42f60a37d97d3 365659-7ugt/_8 cpath: /user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers copyroot: 0 / PLAIN K 9 0-newvers V 27 file 6-365660.0.r365660/394 END ENDREP id: 4-365660.0.r365660/704 type: dir count: 0 text: 365660 640 51 0 0db5c5b08333fadb7b029fadaf9f482d cpath: /user/cperciva/freebsd-update-build/patches/12.2-BETA1 copyroot: 0 / PLAIN K 10 10.0-BETA1 V 29 dir 4-293366.0.r293366/162733 K 10 10.0-BETA2 V 29 dir d-293366.0.r293366/163590 K 10 10.0-BETA3 V 29 dir j-293366.0.r293366/164447 K 10 10.0-BETA4 V 29 dir p-293366.0.r293366/164632 K 8 10.0-RC1 V 29 dir q-293366.0.r293366/166044 K 8 10.0-RC2 V 30 dir 10-293366.0.r293366/167525 K 8 10.0-RC3 V 30 dir 1a-293366.0.r293366/169007 K 8 10.0-RC4 V 30 dir 1k-293366.0.r293366/170171 K 8 10.0-RC5 V 30 dir 1s-293366.0.r293366/171012 K 12 10.0-RELEASE V 30 dir 4-264622.0.r281508/1157414 K 10 10.1-BETA1 V 30 dir 1y-293366.0.r293366/171526 K 10 10.1-BETA2 V 30 dir 22-293366.0.r293366/171711 K 10 10.1-BETA3 V 30 dir 23-293366.0.r293366/173468 K 8 10.1-RC1 V 30 dir 2f-293366.0.r293366/175275 K 8 10.1-RC2 V 30 dir 2r-293366.0.r293366/177719 K 8 10.1-RC3 V 30 dir 37-293366.0.r293366/178559 K 8 10.1-RC4 V 30 dir 3d-293366.0.r293366/179715 K 12 10.1-RELEASE V 29 dir e-275629.0.r316517/482900 K 10 10.2-BETA1 V 30 dir 3l-293366.0.r293366/180233 K 10 10.2-BETA2 V 30 dir 3p-293366.0.r293366/182375 K 8 10.2-RC1 V 30 dir 43-293366.0.r293366/184489 K 8 10.2-RC2 V 30 dir 4h-293366.0.r293366/185335 K 8 10.2-RC3 V 30 dir 4n-293366.0.r293366/187466 K 12 10.2-RELEASE V 29 dir 4-293364.0.r316517/487189 K 12 10.3-RELEASE V 30 dir l-299075.0.r319879/1751268 K 10 11.0-BETA1 V 29 dir q-303377.0.r303377/103943 K 10 11.0-BETA2 V 29 dir w-303377.0.r303377/104467 K 10 11.0-BETA3 V 27 dir 4-303960.0.r303960/2179 K 10 11.0-BETA4 V 27 dir 6-303960.0.r303960/2303 K 12 11.0-RELEASE V 30 dir q-307229.0.r319879/1753271 K 10 11.1-BETA1 V 26 dir 4-319877.0.r319877/840 K 10 12.2-BETA1 V 26 dir 4-365660.0.r365660/704 K 11 5.5-RELEASE V 29 dir c-247826.0.r264622/375336 K 11 6.0-RELEASE V 29 dir p-247826.0.r264622/384049 K 11 6.1-RELEASE V 29 dir t-247826.0.r264622/393101 K 9 6.2-BETA1 V 30 dir 51-293366.0.r293366/188987 K 9 6.2-BETA2 V 30 dir 5b-293366.0.r293366/189172 K 9 6.2-BETA3 V 30 dir 5c-293366.0.r293366/189648 K 7 6.2-RC1 V 30 dir 5g-293366.0.r293366/190484 K 7 6.2-RC2 V 30 dir 5m-293366.0.r293366/191003 K 11 6.2-RELEASE V 29 dir u-247826.0.r264622/398227 K 9 6.3-BETA1 V 30 dir 5q-293366.0.r293366/191524 K 9 6.3-BETA2 V 30 dir 5u-293366.0.r293366/192047 K 7 6.3-RC1 V 30 dir 5y-293366.0.r293366/192568 K 7 6.3-RC2 V 30 dir 62-293366.0.r293366/193401 K 11 6.3-RELEASE V 29 dir v-247826.0.r293366/195537 K 8 6.4-BETA V 30 dir 6b-293366.0.r293366/196091 K 7 6.4-RC2 V 30 dir 6f-293366.0.r293366/196621 K 11 6.4-RELEASE V 29 dir w-247826.0.r264622/414271 K 11 7.0-BETA1.5 V 30 dir 6j-293366.0.r293366/196803 K 9 7.0-BETA2 V 30 dir 6k-293366.0.r293366/197270 K 9 7.0-BETA3 V 30 dir 6o-293366.0.r293366/197793 K 7 7.0-RC1 V 30 dir 6s-293366.0.r293366/198628 K 7 7.0-RC2 V 30 dir 6y-293366.0.r293366/199154 K 11 7.0-RELEASE V 29 dir x-247826.0.r293366/200799 K 8 7.1-BETA V 30 dir 75-293366.0.r293366/201669 K 9 7.1-BETA2 V 30 dir 7b-293366.0.r293366/202202 K 7 7.1-RC1 V 30 dir 7f-293366.0.r293366/203046 K 7 7.1-RC2 V 30 dir 7l-293366.0.r293366/204510 K 11 7.1-RELEASE V 29 dir y-247826.0.r264622/429657 K 7 7.2-RC1 V 30 dir 7v-293366.0.r293366/205034 K 11 7.2-RELEASE V 29 dir z-247826.0.r264622/435714 K 11 7.3-RELEASE V 30 dir 10-247826.0.r264622/441166 K 11 7.4-RELEASE V 30 dir 11-247826.0.r264622/447927 K 9 8.0-BETA1 V 30 dir 7z-293366.0.r293366/206211 K 9 8.0-BETA2 V 30 dir 87-293366.0.r293366/206732 K 9 8.0-BETA4 V 30 dir 8b-293366.0.r293366/207253 K 7 8.0-RC1 V 30 dir 8f-293366.0.r293366/207772 K 7 8.0-RC2 V 30 dir 8j-293366.0.r293366/208941 K 7 8.0-RC3 V 30 dir 8r-293366.0.r293366/210111 K 11 8.0-RELEASE V 30 dir 12-247826.0.r264622/454469 K 9 8.1-BETA1 V 30 dir 8z-293366.0.r293366/210650 K 7 8.1-RC1 V 30 dir 93-293366.0.r293366/211168 K 7 8.1-RC2 V 30 dir 97-293366.0.r293366/211684 K 11 8.1-RELEASE V 30 dir 13-247826.0.r293366/213429 K 11 8.2-RELEASE V 30 dir 14-247826.0.r264622/467382 K 11 8.3-RELEASE V 28 dir 15-247826.0.r265372/4700 K 9 8.4-BETA1 V 30 dir 9e-293366.0.r293366/213986 K 7 8.4-RC1 V 30 dir 9i-293366.0.r293366/214514 K 7 8.4-RC2 V 30 dir 9m-293366.0.r293366/215040 K 7 8.4-RC3 V 30 dir 9q-293366.0.r293366/215222 K 11 8.4-RELEASE V 30 dir iw-264622.0.r293366/221193 K 9 9.0-BETA1 V 30 dir a8-293366.0.r293366/222085 K 9 9.0-BETA2 V 30 dir ae-293366.0.r293366/222939 K 9 9.0-BETA3 V 30 dir ak-293366.0.r293366/223793 K 7 9.0-RC1 V 30 dir aq-293366.0.r293366/224643 K 7 9.0-RC2 V 30 dir aw-293366.0.r293366/226757 K 7 9.0-RC3 V 30 dir ba-293366.0.r293366/228553 K 11 9.0-RELEASE V 30 dir 16-247826.0.r264622/486787 K 7 9.1-RC1 V 30 dir bm-293366.0.r293366/230025 K 7 9.1-RC2 V 30 dir bw-293366.0.r293366/231178 K 7 9.1-RC3 V 30 dir c4-293366.0.r293366/232331 K 11 9.1-RELEASE V 29 dir 1a-247826.0.r276418/11881 K 9 9.2-BETA1 V 30 dir cc-293366.0.r293366/232514 K 9 9.2-BETA2 V 30 dir cd-293366.0.r293366/232640 K 7 9.2-RC1 V 30 dir ce-293366.0.r293366/234404 K 7 9.2-RC2 V 30 dir cq-293366.0.r293366/235908 K 7 9.2-RC3 V 30 dir d0-293366.0.r293366/237428 K 7 9.2-RC4 V 30 dir da-293366.0.r293366/238629 K 11 9.2-RELEASE V 29 dir lw-264622.0.r276418/14756 K 9 9.3-BETA1 V 30 dir di-293366.0.r293366/240111 K 9 9.3-BETA2 V 30 dir ds-293366.0.r293366/240632 K 9 9.3-BETA3 V 30 dir dw-293366.0.r293366/241472 K 7 9.3-RC1 V 30 dir e2-293366.0.r293366/242309 K 7 9.3-RC2 V 30 dir e8-293366.0.r293366/242827 K 7 9.3-RC3 V 30 dir ec-293366.0.r293366/243344 K 11 9.3-RELEASE V 29 dir h-271625.0.r316517/500685 END ENDREP id: b-247826.0.r365660/6249 type: dir pred: b-247826.0.r319879/1758812 count: 52 text: 365660 882 5354 0 572178247977df8afbbf0ea3f2d4a8ab cpath: /user/cperciva/freebsd-update-build/patches copyroot: 0 / PLAIN K 6 README V 29 file 4-247826.0.r247826/55580 K 5 USAGE V 29 file 7-247826.0.r247826/55807 K 24 build-upgrade-patches.sh V 29 file 9-247826.0.r247826/56036 K 7 patches V 27 dir b-247826.0.r365660/6249 K 7 scripts V 29 dir 1b-247826.0.r365635/10495 K 3 src V 27 dir 73-247826.0.r293348/542 K 5 tools V 29 dir 7b-247826.0.r247826/95404 END ENDREP id: 2-247826.0.r365660/6804 type: dir pred: 2-247826.0.r365635/11054 count: 121 text: 365660 6453 338 0 f8a06f1bcbc93266e5fc9494f26be22f props: 293368 0 49 0 defba80ce622170145b506cefccaf0be cpath: /user/cperciva/freebsd-update-build copyroot: 0 / PLAIN K 9 EC2-build V 28 dir 2-261953.0.r261953/22122 K 20 freebsd-update-build V 27 dir 2-247826.0.r365660/6804 K 21 freebsd-update-mirror V 28 dir 7f-247826.0.r339903/1008 K 9 panicmail V 26 dir 2-257319.0.r335829/489 K 5 pkesh V 27 dir 2-257318.0.r257606/1160 K 14 portsnap-build V 26 dir 3-247750.0.r338231/757 K 15 portsnap-mirror V 26 dir 2-247766.0.r257073/533 END ENDREP id: 1-247750.0.r365660/7432 type: dir pred: 1-247750.0.r365635/11684 count: 153 text: 365660 7053 366 0 2d09f51397d77b509b3808a4381912f4 cpath: /user/cperciva copyroot: 0 / PLAIN K 14 GUIDELINES.txt V 28 file 1-183719.0.r235275/4932 K 6 adrian V 30 dir 1-185062.0.r252433/2226618 K 2 ae V 28 dir 1-208944.0.r271652/46136 K 3 alc V 29 dir 1-187698.0.r319931/387706 K 6 alfred V 29 dir 1-242436.0.r248541/972492 K 5 andre V 28 dir 1-232338.0.r257866/21026 K 7 asomers V 27 dir 1-334355.0.r334355/4573 K 7 attilio V 28 dir 1-225231.0.r268426/62523 K 3 avg V 28 dir 1-221670.0.r222061/15164 K 4 bapt V 27 dir 1-310576.0.r314959/1201 K 6 brooks V 30 dir 1-221798.0.r238996/6657488 K 6 bryanv V 30 dir 1-247244.0.r254233/2224957 K 10 bugmeister V 28 dir 1-246956.0.r246977/10787 K 2 bz V 30 dir 1-262796.0.r267241/3947027 K 8 cperciva V 27 dir 1-247750.0.r365660/7432 K 5 crees V 26 dir 1-241560.0.r271323/796 K 7 davidxu V 28 dir 1-214656.0.r233443/10236 K 7 dchagin V 24 dir 1-247158.0.r293472/0 K 7 delphij V 28 dir 1-204897.0.r281757/49415 K 3 des V 27 dir 1-194080.0.r360389/2628 K 3 dfr V 28 dir 1-184622.0.r190546/15577 K 3 dim V 24 dir 1-287628.0.r287682/0 K 5 dougb V 27 dir 1-198220.0.r241090/1338 K 2 ed V 24 dir 1-193319.0.r282938/0 K 5 edwin V 27 dir 1-183766.0.r211835/4734 K 3 eri V 30 dir 1-197864.0.r204245/1235173 K 7 fabient V 28 dir 1-197268.0.r197319/29049 K 5 gabor V 28 dir 1-221404.0.r241808/16035 K 3 gad V 26 dir 1-192136.0.r193132/797 K 5 gavin V 24 dir 1-241771.0.r241771/0 K 3 gjb V 27 dir 1-259932.0.r365261/2580 K 7 glebius V 27 dir 1-256016.0.r263263/1496 K 3 gnn V 26 dir 1-194403.0.r241557/377 K 5 gonzo V 28 dir 1-261007.0.r261008/12965 K 3 hrs V 29 dir 1-204715.0.r259160/751575 K 3 imp V 28 dir 1-184493.0.r296072/30422 K 5 jceel V 28 dir 1-235295.0.r289143/21413 K 8 jchandra V 28 dir 1-215108.0.r233508/10955 K 4 jeff V 30 dir 1-325751.0.r334127/2924233 K 9 jimharris V 28 dir 1-228374.0.r244229/58997 K 8 jmallett V 24 dir 1-204380.0.r232796/0 K 4 jmmv V 27 dir 1-260090.0.r271566/2722 K 8 keramida V 28 dir 1-185204.0.r185209/12308 K 3 kib V 27 dir 1-204124.0.r207315/7961 K 5 kmacy V 28 dir 1-183756.0.r208125/14923 K 8 lstewart V 26 dir 1-184064.0.r207267/223 K 5 luigi V 28 dir 1-186852.0.r230582/16409 K 4 lulf V 24 dir 1-184032.0.r184032/0 K 6 marcel V 28 dir 1-234079.0.r286996/10798 K 5 markj V 29 dir 1-317616.0.r333148/301176 K 6 mjacob V 30 dir 1-227632.0.r247552/1011971 K 6 mlaier V 29 dir 1-185890.0.r186173/494420 K 2 mr V 29 dir 1-218553.0.r219466/272874 K 8 netchild V 27 dir 1-183913.0.r234301/7726 K 4 ngie V 27 dir 1-269535.0.r348046/3827 K 2 np V 24 dir 1-234243.0.r277955/0 K 10 nwhitehorn V 27 dir 1-209626.0.r355259/2421 K 4 nyan V 24 dir 1-183793.0.r221739/0 K 6 obrien V 26 dir 1-223658.0.r255482/391 K 5 peter V 26 dir 1-180165.0.r194308/447 K 6 peterj V 27 dir 1-251835.0.r251836/3711 K 9 pgollucci V 24 dir 1-210277.0.r212598/0 K 3 pho V 28 dir 1-237221.0.r364804/42337 K 4 piso V 28 dir 1-190859.0.r191123/13283 K 6 qingli V 24 dir 1-185818.0.r185926/0 K 5 rafan V 28 dir 1-184791.0.r184800/99215 K 6 rpaulo V 26 dir 1-183745.0.r249165/483 K 3 sam V 27 dir 1-186655.0.r188169/8921 K 6 sbruno V 31 dir 1-227643.0.r283993/10255880 K 5 simon V 26 dir 1-220972.0.r220973/355 K 4 syuu V 28 dir 1-250977.0.r255200/11329 K 7 thompsa V 24 dir 1-185730.0.r208057/0 K 3 uqs V 26 dir 1-241674.0.r357732/769 K 7 weongyo V 28 dir 1-212249.0.r215346/18369 END ENDREP id: a-1.0.r365660/10850 type: dir pred: a-1.0.r365635/15104 count: 9502 text: 365660 7606 3231 0 b4e799afe695ae6e6043df234293a5b7 cpath: /user copyroot: 0 / minfo-cnt: 11990 PLAIN K 11 ROADMAP.txt V 26 file 0-179453.0.r285589/70 K 4 head V 23 dir 5-1.0.r365658/13427 K 8 projects V 22 dir 6-1.0.r365372/7247 K 7 release V 22 dir 7-1.0.r362227/3485 K 6 releng V 23 dir 8-1.0.r365634/21160 K 6 stable V 23 dir 9-1.0.r365659/51867 K 8 svnadmin V 27 dir 0-179447.0.r365610/1309 K 4 user V 23 dir a-1.0.r365660/10850 K 6 vendor V 22 dir b-1.0.r365636/8747 K 13 vendor-crypto V 25 dir 0-1575.0.r360174/5542 K 10 vendor-sys V 27 dir 0-12116.0.r365346/16388 END ENDREP id: 0.0.r365660/11512 type: dir pred: 0.0.r365659/52531 count: 365660 text: 365660 11025 474 0 d6618c27d5e7a35124e7ece8e761bf63 props: 289270 0 4229 0 20f578acc837c5e58fc64b9eaa493aea cpath: / copyroot: 0 / minfo-cnt: 46598 _4.0.t365659-7ugt add-dir false false /user/cperciva/freebsd-update-build/patches/12.2-BETA1 _6.0.t365659-7ugt add-file true false /user/cperciva/freebsd-update-build/patches/12.2-BETA1/0-newvers 11512 11737