DELTA 228171 0 3623 SVNc'21%WQu/c"&:K x^T]o6|X8. S%& K.IgŅ,Cs{8~B;3 poC:&RК՝nw֪i vԺnC%~>e8Bm/po[+SƶNݙڸAǒoZO?>$>>%TȄScғ?\Uzwld/o˗FF}pӄz?o\YH޼WMmScv ERk}W6"i==? 8K}_ ו\k&Pڢ,nR/wQwtEٸ:7VFkiTrA{[㽘Oo<[k׃?ց٩Vn;lNΔ: Axulv'Zʬu;ïG,q_Np y~hI ӜLr6*dTl #޻ l6O .'dTD8-M"@r )1e28u'cQOX2,4f2~A.Y\ü\4O+a"N dzC3 bJ&a9!*ADcF1j˥9GL_FXA,-!32Ang (FB2YH H (ENDREP id: d-52400.1-202337.r241338/1013 type: file pred: d-52400.1-202337.r228171/3650 count: 81 text: 241338 0 986 40487 4d88f7acbadb41050a920bd74483f0bd c1db902f3d11614a396b8bba97f3d00fa53c141f 241337-567t/_5 props: 179315 70170 64 0 a0283a89aab39edd4cfb26f6b28671ff cpath: /stable/8/usr.sbin/mergemaster/mergemaster.sh copyroot: 52401 /head/usr.sbin/mergemaster/mergemaster.sh PLAIN K 8 Makefile V 26 file 4-52403.0.r115821/171 K 13 mergemaster.8 V 34 file b-52400.0-202337.r227148/1132 K 14 mergemaster.sh V 34 file d-52400.1-202337.r241338/1013 END ENDREP PLAIN K 13 svn:mergeinfo V 564 /head/usr.sbin/mergemaster:196200,196211-196212,196280-196283,196879,198020,198480,198483,198897,199747,199799,199821-199822,200171,200182,200275,200295,200359,200416,200425,200700-200701,200708,201217,201291-201293,201323,201765,202817,203376,203384,203710,204195,205145,205272,207612,208088,208320,212770,213573,213738,213814,215651,215803,216138,216591,218010,220301,220312,220314,221604,223132,223152,224641,224726,227006,227013,227755,228122,241218 /user/luigi/ipfw3-r8/usr.sbin/mergemaster:204833-205419 /vendor/resolver/dist/usr.sbin/mergemaster:1540-186085 END ENDREP id: 2-52401.0-196045.r241338/2176 type: dir pred: 2-52401.0-196045.r231480/512393 count: 144 text: 241338 1388 168 168 8e2714281dcb1f42c063eef12f776c95 props: 241338 1569 594 0 caf28c291e70d8311e21b11e3a668df5 cpath: /stable/8/usr.sbin/mergemaster copyroot: 196045 /stable/8 minfo-cnt: 1 minfo-here: y PLAIN K 9 IPXrouted V 35 dir 2-11820.0-196045.r231480/522839 K 8 Makefile V 33 file 24-1553.0-196285.r239563/624 K 12 Makefile.inc V 36 file 27-1553.4-231444.r231480/430079 K 2 ac V 34 dir b-1554.0-196045.r231480/545322 K 6 accton V 34 dir d-1554.0-196045.r231480/491152 K 4 acpi V 34 dir 1l-65047.0-196045.r237231/7636 K 7 adduser V 32 dir 2-5263.0-196045.r240759/1095 K 3 amd V 33 dir f-1554.0-196045.r231704/31817 K 9 ancontrol V 34 dir 1k-55992.0-196045.r240036/1071 K 3 apm V 34 dir 2-3259.0-196045.r231480/470743 K 4 apmd V 35 dir 2-48731.0-196045.r231480/495878 K 3 arp V 35 dir 15-1554.0-196045.r231480/517944 K 3 asf V 36 dir 2-116009.0-196045.r231480/535289 K 5 audit V 36 dir 4-155213.0-196045.r231480/490393 K 6 auditd V 36 dir 8-155213.0-196045.r231480/536050 K 11 auditreduce V 36 dir c-155213.0-196045.r231480/412244 K 6 authpf V 37 dir 18-126385.0-196045.r231480/409159 K 9 bluetooth V 37 dir 58-107120.0-196045.r231480/394848 K 8 boot0cfg V 35 dir 2-44197.0-196045.r231480/556332 K 9 boot98cfg V 35 dir 4-64126.0-196045.r231480/419809 K 10 bootparamd V 33 dir 2-6752.0-196045.r231704/43605 K 6 bsnmpd V 35 dir 1h-122405.0-196045.r241004/3344 K 5 btxld V 35 dir 2-39093.0-196045.r231480/402655 K 6 burncd V 34 dir 7-55522.0-196045.r233714/10852 K 9 cdcontrol V 35 dir 4-10099.0-196045.r231480/523625 K 6 chkgrp V 35 dir 2-36332.0-196045.r231480/472263 K 5 chown V 35 dir 19-1554.0-196045.r231480/425339 K 6 chroot V 35 dir 1b-1554.0-196045.r231480/529126 K 6 ckdist V 35 dir 2-21919.0-196045.r231480/379839 K 11 clear_locks V 37 dir 4m-177633.0-196045.r231480/428487 K 6 config V 33 dir 1d-1554.0-196045.r236132/2523 K 10 cpucontrol V 35 dir 19-181430.0-196045.r237838/1430 K 9 crashinfo V 36 dir 4-181335.0-196045.r231480/514815 K 4 cron V 32 dir 2-2312.0-196045.r239877/1704 K 6 crunch V 34 dir 2-1723.0-196045.r231480/407758 K 3 ctm V 34 dir 2-2887.0-196045.r231480/476093 K 6 daemon V 33 dir 4-82547.0-196045.r236971/1330 K 9 dconschat V 37 dir 1b-121468.0-196045.r231480/396392 K 7 devinfo V 35 dir 2-75752.0-196045.r231480/501271 K 7 digictl V 36 dir 3i-76195.0-196045.r231480/494354 K 8 diskinfo V 36 dir 4-113287.0-196045.r231480/489632 K 16 dnssec-dsfromkey V 37 dir pk-193149.0-196045.r231480/426922 K 19 dnssec-keyfromlabel V 37 dir po-193149.0-196045.r231480/436339 K 13 dnssec-keygen V 36 dir u-135569.0-196045.r231480/386775 K 15 dnssec-signzone V 36 dir y-135569.0-196045.r231480/398767 K 7 dumpcis V 36 dir 4-185032.0-196045.r231480/468425 K 7 editmap V 35 dir 4-90797.0-196045.r231480/475329 K 7 edquota V 35 dir 1n-1554.0-196045.r231480/532203 K 6 eeprom V 36 dir 2-129590.0-196045.r231480/478440 K 7 extattr V 36 dir 2-102607.0-196045.r231480/502037 K 10 extattrctl V 35 dir 4-59247.0-196045.r231480/504359 K 6 faithd V 36 dir 1y-56668.0-196045.r231480/387584 K 9 fdcontrol V 34 dir 2-4008.0-196045.r231480/526734 K 8 fdformat V 34 dir 2-1023.0-196045.r231480/554751 K 6 fdread V 35 dir 2-76590.0-196045.r231480/430933 K 7 fdwrite V 34 dir 2-2850.0-196045.r231480/557110 K 7 fifolog V 36 dir 2-176998.0-196045.r231480/477675 K 7 flowctl V 34 dir 4-135380.0-196045.r238620/4011 K 14 freebsd-update V 35 dir h-161748.0-196045.r237347/37253 K 9 ftp-proxy V 37 dir 18-171173.0-196045.r231480/534517 K 9 fwcontrol V 36 dir 4-108441.0-196045.r231480/469987 K 7 getfmac V 36 dir 4-105756.0-196045.r231480/533744 K 7 getpmac V 36 dir c-105756.0-196045.r231480/495122 K 4 gssd V 36 dir 63-184588.0-196045.r231704/37843 K 5 gstat V 36 dir 4-112444.0-196045.r231480/543791 K 3 i2c V 35 dir 4-187712.0-196045.r237347/38527 K 8 ifmcstat V 34 dir 1i-55163.0-196045.r237426/5606 K 5 inetd V 34 dir 1r-1554.0-196045.r236875/15953 K 6 iostat V 35 dir 1t-1554.0-196045.r231480/555531 K 10 ip6addrctl V 36 dir 4-121748.0-196045.r231480/480779 K 8 ipfwpcap V 36 dir 2-151427.0-196045.r231480/451776 K 4 jail V 36 dir 2o-46155.0-196045.r231480/517151 K 5 jexec V 36 dir b-113277.0-196045.r231480/481542 K 3 jls V 34 dir j-113277.0-196045.r235841/1578 K 10 kbdcontrol V 34 dir 2-2088.0-196045.r231480/485417 K 6 kbdmap V 32 dir 2-7303.0-196045.r237423/1112 K 6 kernbb V 34 dir 4-6984.0-196045.r231480/446554 K 7 keyserv V 34 dir 2-26235.0-196045.r231704/40960 K 5 kgmon V 35 dir 1v-1554.0-196045.r231480/453319 K 5 kgzip V 35 dir 2-48906.0-196045.r231480/546075 K 7 kldxref V 33 dir 4-83322.0-196045.r237416/1379 K 9 lastlogin V 35 dir 4-68723.0-196045.r231480/553959 K 9 lmcconfig V 36 dir f-150850.0-196045.r231480/486189 K 3 lpr V 32 dir z-1553.0-196045.r241099/3468 K 10 lptcontrol V 34 dir 2-2471.0-196045.r231480/531438 K 9 mailstats V 35 dir 2-38095.0-196045.r231480/505134 K 11 mailwrapper V 35 dir 7-54817.0-196045.r231480/408394 K 6 makefs V 36 dir 1-185222.3-196285.r231480/420669 K 7 makemap V 35 dir 2-38097.0-196045.r231480/560360 K 6 manctl V 34 dir 2-1367.0-196045.r231480/493592 K 10 memcontrol V 35 dir 2-45411.0-196045.r231480/516359 K 11 mergemaster V 33 dir 2-52401.0-196045.r241338/2176 K 7 mfiutil V 34 dir e-196200.8-196285.r237590/5581 K 5 mixer V 34 dir 2-6449.0-196045.r231480/498190 K 9 mld6query V 35 dir 2-62915.0-196045.r231480/524397 K 10 mlxcontrol V 35 dir 2-59139.0-196045.r231480/462685 K 10 mount_nwfs V 35 dir c-52252.0-196045.r231480/483873 K 14 mount_portalfs V 35 dir 4p-1558.0-196045.r231480/401890 K 11 mount_smbfs V 35 dir q-87874.0-196045.r231480/385991 K 6 mountd V 33 dir 5g-1558.0-196045.r241040/1343 K 6 moused V 33 dir 2-16566.0-196045.r241085/8165 K 7 mptable V 35 dir 2-25265.0-196045.r231480/382919 K 7 mptutil V 34 dir 4-196212.0-196286.r237050/1510 K 5 mtest V 35 dir 2-20530.0-196045.r231480/527515 K 5 mtree V 35 dir 2j-1554.0-196045.r231480/423039 K 5 named V 34 dir 2-2981.0-196045.r231480/429272 K 15 named-checkconf V 37 dir 2r-135549.0-196045.r231480/505923 K 15 named-checkzone V 37 dir 2v-135549.0-196045.r231480/460360 K 12 named.reload V 35 dir 2-17910.0-196045.r231480/552305 K 7 ndiscvt V 36 dir 2-123475.0-196045.r231480/400337 K 3 ndp V 36 dir 24-55505.0-196045.r231480/427714 K 9 newsyslog V 33 dir 2-13245.0-196045.r238521/1520 K 6 nfscbd V 36 dir 4-192811.0-196045.r231480/441088 K 4 nfsd V 35 dir 5s-1558.0-196045.r231480/525954 K 12 nfsdumpstate V 36 dir c-192811.0-196045.r231480/403445 K 9 nfsrevoke V 36 dir k-192811.0-196045.r231480/464206 K 8 nfsuserd V 36 dir s-192811.0-196045.r231480/409939 K 5 ngctl V 36 dir 8t-52419.0-196045.r231480/557868 K 6 nghook V 36 dir 9n-52419.0-196045.r231480/457284 K 7 nologin V 35 dir 60-1558.0-196045.r231480/447316 K 4 nscd V 37 dir 3q-158115.0-196045.r231480/384440 K 3 ntp V 34 dir 2-54552.0-196045.r235585/45325 K 5 nvram V 37 dir 11-160892.0-196045.r231480/380595 K 7 ofwdump V 36 dir 2-105401.0-196045.r231480/543032 K 7 pciconf V 35 dir 2-19103.0-196045.r241102/148988 K 8 periodic V 35 dir 2-28113.0-196045.r231480/482324 K 3 pkg V 33 dir 4-234313.0-239563.r240291/631 K 11 pkg_install V 31 dir 2-328.0-196045.r241136/9192 K 11 pmcannotate V 36 dir 4-185347.0-196045.r231480/399565 K 10 pmccontrol V 37 dir 31-145256.0-196045.r231480/456517 K 7 pmcstat V 36 dir 39-145256.0-196045.r240094/12148 K 7 pnpinfo V 35 dir 2-29619.0-196045.r231480/451010 K 8 portsnap V 34 dir h-148871.0-196045.r235311/1701 K 6 powerd V 36 dir 2-142577.0-196045.r231480/413035 K 3 ppp V 33 dir 37-6059.0-196045.r234264/6846 K 6 pppctl V 35 dir 4-27008.0-196045.r231480/532979 K 9 praliases V 35 dir 2-38096.0-196045.r231480/381366 K 7 praudit V 36 dir g-155213.0-196045.r231480/509947 K 7 procctl V 35 dir b-31565.0-196045.r231480/395621 K 5 pstat V 35 dir 2n-1554.0-196045.r231480/459574 K 2 pw V 33 dir 2-20254.0-196045.r232550/1986 K 8 pwd_mkdb V 35 dir 2p-1554.0-196045.r231480/498952 K 4 quot V 35 dir 2r-1554.0-196045.r231480/434765 K 7 quotaon V 35 dir 2t-1554.0-196045.r231480/383685 K 5 rarpd V 34 dir 2-6824.0-196045.r231480/558627 K 8 repquota V 35 dir 2v-1554.0-196045.r231480/484643 K 9 rip6query V 36 dir 1y-55163.0-196045.r231480/421451 K 3 rmt V 35 dir 2x-1554.0-196045.r231480/463440 K 4 rndc V 37 dir 33-135549.0-196045.r231480/458041 K 12 rndc-confgen V 37 dir 37-135549.0-196045.r231480/389111 K 7 route6d V 36 dir 26-55163.0-196045.r231480/500490 K 9 rpc.lockd V 34 dir 5-14124.0-196045.r231704/33453 K 9 rpc.statd V 34 dir 5-14126.0-196045.r231704/36586 K 11 rpc.umntall V 35 dir 4-53494.0-196045.r231480/439515 K 13 rpc.yppasswdd V 34 dir 2-14063.0-196045.r231704/35051 K 13 rpc.ypupdated V 34 dir 2-26237.0-196045.r231704/39480 K 10 rpc.ypxfrd V 34 dir 2-16126.0-196045.r231704/45056 K 7 rpcbind V 36 dir 7c-74462.0-196045.r231480/496661 K 7 rrenumd V 36 dir 2e-55505.0-196045.r231480/454080 K 8 rtadvctl V 35 dir 5-231802.0-196045.r237347/34504 K 6 rtadvd V 35 dir 2u-55505.0-196045.r237347/43051 K 6 rtprio V 34 dir 4-2447.0-196045.r231480/473780 K 6 rtsold V 36 dir 2m-55163.0-196045.r231480/422245 K 5 rwhod V 35 dir 2z-1554.0-196045.r231480/497421 K 2 sa V 34 dir 2-3126.0-196045.r231480/419047 K 4 sade V 34 dir 5-8098.0-196045.r231480/469198 K 8 sendmail V 35 dir 31-1554.0-196045.r231480/502805 K 7 service V 36 dir 4-200743.0-201273.r231480/416384 K 13 services_mkdb V 36 dir 4-206156.0-206785.r231480/541436 K 6 setfib V 37 dir 2l-178888.0-196045.r231480/561120 K 7 setfmac V 36 dir i-105756.0-196045.r231480/544569 K 7 setpmac V 36 dir q-105756.0-196045.r231480/503582 K 9 sicontrol V 35 dir 2-10045.0-196045.r231480/423808 K 6 smbmsg V 35 dir 2-129331.0-196045.r237347/35877 K 8 snapinfo V 36 dir 2-148197.0-196045.r231480/515585 K 8 spkrtest V 34 dir 2-3763.0-196045.r231480/405051 K 5 spray V 35 dir 2-13243.0-196045.r231480/438728 K 10 sysinstall V 32 dir 8-8098.0-196045.r240972/4096 K 7 syslogd V 33 dir 4f-1554.0-196045.r233008/1406 K 7 tcpdchk V 35 dir 4-44747.0-196045.r231480/379078 K 9 tcpdmatch V 35 dir 8-44747.0-196045.r231480/397977 K 7 tcpdrop V 36 dir 8-141381.0-196045.r231480/513176 K 7 tcpdump V 31 dir u-3.0-196045.r240578/202768 K 5 timed V 35 dir 4h-1554.0-196045.r231480/444214 K 10 traceroute V 33 dir 4t-1554.0-196045.r235137/7461 K 11 traceroute6 V 34 dir 34-55163.0-196045.r237489/1265 K 4 trpt V 35 dir 4v-1554.0-196045.r231480/525153 K 7 tzsetup V 34 dir 2-2751.0-196045.r231480/455726 K 8 uathload V 36 dir t-190688.0-196045.r231480/441868 K 6 ugidfw V 36 dir 4-101209.0-196045.r231480/431706 K 7 uhsoctl V 36 dir s-202503.0-196045.r231480/405828 K 9 usbconfig V 37 dir j4-184610.0-196045.r231480/404277 K 7 usbdevs V 36 dir 2f-41366.0-196045.r231480/401104 K 7 usbdump V 34 dir 2-215651.2-221174.r235015/1715 K 10 vidcontrol V 34 dir 2-2089.0-196045.r231480/382154 K 4 vipw V 35 dir 51-1554.0-196045.r231480/432463 K 4 wake V 34 dir 4-195200.0-196045.r235509/1123 K 5 watch V 34 dir 9-6521.0-196045.r231480/448073 K 9 watchdogd V 34 dir n-116874.0-196045.r240243/2699 K 9 wlandebug V 37 dir 12-153317.0-196045.r231480/510716 K 8 wlconfig V 35 dir 2-26006.0-196045.r231480/511488 K 3 wpa V 34 dir 2-147020.0-196045.r238663/1876 K 7 yp_mkdb V 35 dir 2-15424.0-196045.r231480/433224 K 6 ypbind V 34 dir 2-1927.0-196045.r231480/547639 K 6 yppoll V 34 dir 4-1929.0-196045.r231480/473022 K 6 yppush V 34 dir 2-13395.0-196045.r231704/46426 K 6 ypserv V 34 dir 2-12892.0-196045.r231704/48280 K 5 ypset V 34 dir a-1929.0-196045.r231480/389876 K 3 zic V 34 dir 2-2703.0-196045.r231480/548479 K 3 zzz V 36 dir 2-117557.0-196045.r231480/410692 END ENDREP id: q-3.0-196045.r241338/13703 type: dir pred: q-3.0-196045.r241136/20715 count: 12244 text: 241338 2479 11211 11211 a54d1bd79f7159cbe9e414b443ebc702 props: 241085 19687 552 0 71a8bb3b941407ff41126665aafcc6c3 cpath: /stable/8/usr.sbin copyroot: 196045 /stable/8 minfo-cnt: 236 minfo-here: y PLAIN K 9 COPYRIGHT V 35 file 1-2656.0-196045.r231480/681834 K 5 LOCKS V 37 file 1-146890.0-196045.r231480/685888 K 11 MAINTAINERS V 33 file 1-94742.0-196045.r240431/638 K 8 Makefile V 32 file 3-1594.0-205747.r232646/545 K 13 Makefile.inc1 V 35 file 5-38666.0-196045.r236342/18626 K 17 ObsoleteFiles.inc V 36 file 4-148330.0-196045.r237538/26533 K 6 README V 36 file 1-21173.0-196045.r231480/222829 K 8 UPDATING V 33 file 1-41806.0-196045.r241191/838 K 3 bin V 29 dir 1-5.0-196045.r241321/3314 K 4 cddl V 35 dir 1-168404.0-196045.r240960/10724 K 7 contrib V 34 dir 1-16755.0-196045.r240732/23213 K 6 crypto V 35 dir 1-25405.0-196045.r237999/107408 K 3 etc V 31 dir 1-38.0-196045.r241278/14511 K 5 games V 32 dir 1-2491.0-196045.r241238/3572 K 3 gnu V 29 dir 1-3.0-196045.r236908/3128 K 7 include V 31 dir 1-697.0-196045.r241060/7503 K 9 kerberos5 V 36 dir 4q-29815.0-196045.r231480/347053 K 3 lib V 30 dir 6-5.0-196045.r241317/22580 K 7 libexec V 29 dir c-5.0-196045.r241206/2652 K 7 release V 32 dir 1-3027.0-196045.r239651/3905 K 6 rescue V 36 dir 7-117035.0-196045.r231480/148488 K 4 sbin V 30 dir fa-4.0-196045.r240556/8057 K 6 secure V 34 dir r-1553.0-196045.r237999/235251 K 5 share V 30 dir e-3.0-196045.r241319/24992 K 3 sys V 30 dir g-5.0-196045.r241335/93162 K 5 tools V 33 dir 43-1590.0-196045.r240906/6612 K 7 usr.bin V 31 dir m-3.0-196045.r240578/202006 K 8 usr.sbin V 30 dir q-3.0-196045.r241338/13703 END ENDREP id: 5-1.0-196045.r241338/15422 type: dir pred: 5-1.0-196045.r241335/94877 count: 154763 text: 241338 13995 1414 1414 74fabcc07932ab448ea63b81ba4e036e props: 240707 201614 734 0 84adb974ccac061543e498e23bb41a90 cpath: /stable/8 copyroot: 196045 /stable/8 minfo-cnt: 1090 minfo-here: y PLAIN K 5 2.0.5 V 28 dir 5-1.0-8869.r8869/1136095 K 3 2.1 V 26 dir 5-1.0-9211.r66618/6773 K 3 2.2 V 28 dir 5-1.0-19327.r101622/6579 K 1 3 V 29 dir 5-1.0-42951.r175126/10126 K 1 4 V 29 dir 5-1.0-57955.r194744/18612 K 1 5 V 29 dir 5-1.0-133968.r201713/7816 K 1 6 V 29 dir 5-1.0-147906.r240458/9571 K 1 7 V 29 dir 5-1.0-172506.r241239/5152 K 1 8 V 30 dir 5-1.0-196045.r241338/15422 K 1 9 V 30 dir 5-1.0-225736.r241337/13964 END ENDREP id: 9-1.0.r241338/16139 type: dir pred: 9-1.0.r241337/14679 count: 53082 text: 241338 15707 419 419 2e028a93abe371a6b6e47d022b0bfce1 cpath: /stable copyroot: 0 / minfo-cnt: 2177 PLAIN K 11 ROADMAP.txt V 27 file 0-179453.0.r221478/293 K 7 cvs2svn V 23 dir 0-1.0.r177821/70859 K 4 head V 23 dir 5-1.0.r241336/18972 K 8 projects V 23 dir 6-1.0.r241232/17582 K 7 release V 22 dir 7-1.0.r234063/2758 K 6 releng V 23 dir 8-1.0.r241133/26931 K 6 stable V 23 dir 9-1.0.r241338/16139 K 8 svnadmin V 27 dir 0-179447.0.r240538/2674 K 4 user V 22 dir a-1.0.r241090/3885 K 6 vendor V 22 dir b-1.0.r241237/6966 K 13 vendor-crypto V 25 dir 0-1575.0.r239851/3086 K 10 vendor-sys V 27 dir 0-12116.0.r240949/23947 END ENDREP id: 0.0.r241338/16847 type: dir pred: 0.0.r241337/15387 count: 241338 text: 241338 16318 516 516 41b64e31f20c5ea660ab913d406198e6 cpath: / copyroot: 0 / minfo-cnt: 27578 2-52401.0-196045.t241337-567t modify-dir false true /stable/8/usr.sbin/mergemaster d-52400.1-202337.t241337-567t modify-file true false /stable/8/usr.sbin/mergemaster/mergemaster.sh 16847 17018