DELTA 250584 0 1150 SVN&' 'nENDREP DELTA 186695 0 8059 SVNt=%WKQm8]C>tzo<yu|s(x?-7F|R9! M8i@a<lp^Fka0^FQ. 1_B,+dqx@/IP:>ndJzIzIVl2 l;hMwxs={wO3bR=uE>fS~f`wd[tSdI`#la>Ris.Qx^ZmsH ,$wk)f.Q /z\Xh#$Vfs[o'SR3Pw>9ݼлoo߽~yΝ( u}"qXDO­ѵ/XP,"q<_4;9fu׻w1f $"8_$zH̗! k'Y$t V͗Df']-"0w4ہ'/Id"LI"V넒 ٬#EKIP" Bx­D :==wx4\"k-bGJ%F$Œ`"lߋEܠ֝>di6jT;{kt,J3gfxa}s) s`NOÇJ.+Ss 'W;yr"}F #,qz"i'ߵ e<Ge=WJ";۬":CAR ibNNX?d!,W0j,pE&7,KA[g1jr|/a8Y\=nGjgN<cuY{vq8S'V]SRGFU%Z Q+gGn-ȁ߸`\i{ޭ:lӽ9@XFqπ:oK_nZ;^NRQ(xLy9VXd.HUPSk@| y>U+WȴVT:T?=GQ瑵gc:g^k!})$I x+5m\]G#! L?]6*22Ghjzx&-U@=N"oDi8'YsИ>7:[dB<V̟zOcD>u"_59ޭ_4hlLFvViȌY#ʝ@"ѥ_%oo|\cm_I^-.aa#!SG©cµɩ.-I: %l %y#H@UGNJx6>C/^8޺T22{(nkܹ,nnԔeAM ,qY,X=Og!Rh(mLBl4LYx*q/,TxOͣǗKrbwAoyh%^3l޽织FsAw97W%h<(LC (:&u *?Xz"NGğ4e*@]WZ: (%{m*H~GEh𼹈7V21{E>>\{ e}IG)}$6rPr#L,$JiF[B+`Y[Bu։ܸS:o[1An$ǑCCNʓi1ܯѵd;}%K$JK`ni0\v'Kp2FuVӫb*"y@z0VQ$3 `/ Peܣ*9t*)G-־3/u6)ZjC:-|OCԐ_)'(X>G~{5;nqQMʻh|R)@wV|]WVO(8UQso-^#I}U*B\"3wE*+TȶZbW@^ͿE^_}C< ky>mU7:Z=+CG`oȠTiۗWтa;`"/nR>mKo[+1!m%jfR;)ߨ"zDkF?qxuJ2s6/V7&Vby8F6wڿoV_?;.&l~P["`_,d:}d ,2i:\@lw #UYZGl♃Y+pMF_ 7j"D/  3^^'1Qկ{'-8.!r(z?R]w\orL@ܼ@|۟h'Ra{J34GW#w{gQg4/f^(ԊZꋶv5(5cj߭fZfOM-z,EYCk'"M~PG2FU[3$CyD >"Z|W|S-R )y,v)TWt,uQr:T/oLkʣO`%S"<h dn.յwO2!ӡ+Y&oy3=ƝZW`EV<-Jj)x Bu%^`\ KGN-/)jIϒx&FƢt]FĈԹod,VqC!ƙhȟ^y C)T'O QM"ђu+k1C(&+Iyn@@JѳYAkg P'mh &aWK;ZAzqBܲM{bt9-&)~@%66r{P0eJC'׶90(v/u<J> t1Tj˺ 3+iq90/a1-3-`oRƉmcuҢd^Pddej]0%kߪ/SENDREP id: d-52400.1-202337.r255476/4640 type: file pred: d-52400.1-202337.r250584/1177 count: 85 text: 255476 0 29 40231 403c6de136058290c35fe8dc265fdbd5 a220f3691d96030e4cad4dd1fe57cf6c1a0e0639 255475-5h4l/_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.r255476/4640 END ENDREP PLAIN K 13 svn:mergeinfo V 592 /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,243891-243892,250463,255428 /user/luigi/ipfw3-r8/usr.sbin/mergemaster:204833-205419 /vendor/resolver/dist/usr.sbin/mergemaster:1540-186085 END ENDREP id: 2-52401.0-196045.r255476/5830 type: dir pred: 2-52401.0-196045.r250584/2361 count: 148 text: 255476 5014 168 168 c47f46ce46c7c92dedfe3d8498f602ea props: 255476 5195 622 0 c0cc1903d1b1ac9d81a8688e896ea5a1 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 36 file 24-1553.0-196285.r246656/314214 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.r251308/1896 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 8 arpaname V 37 dir w-224093.1y-246656.r246656/314657 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 35 dir 18-126385.0-196045.r253358/4944 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.r252821/3261 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 32 dir 2-36332.0-196045.r244068/967 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.r250067/2087 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.r245994/1011 K 9 dconschat V 37 dir 1b-121468.0-196045.r231480/396392 K 12 ddns-confgen V 38 dir 10-224093.1z-246656.r246656/315042 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.r242543/755192 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 13 dnssec-revoke V 38 dir 14-224093.20-246656.r246656/315438 K 14 dnssec-settime V 38 dir 18-224093.21-246656.r246656/315837 K 15 dnssec-signzone V 36 dir y-135569.0-196045.r246656/317067 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 34 dir 1n-1554.0-196045.r242164/32275 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 9 genrandom V 38 dir 1e-224093.22-246656.r246656/317451 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 35 dir 63-184588.0-196045.r251721/1475 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 33 dir 1r-1554.0-196045.r246403/1647 K 6 iostat V 35 dir 1t-1554.0-196045.r231480/555531 K 10 ip6addrctl V 34 dir 4-121748.0-196045.r241429/1046 K 8 ipfwpcap V 36 dir 2-151427.0-196045.r231480/451776 K 14 isc-hmac-fixup V 38 dir 1i-224093.23-246656.r246656/317842 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 34 dir 1v-1554.0-196045.r242164/33567 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 33 dir 2-45411.0-196045.r242021/1098 K 11 mergemaster V 33 dir 2-52401.0-196045.r255476/5830 K 7 mfiutil V 34 dir e-196200.8-196285.r255430/4351 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.r247395/1244 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.r246656/319060 K 15 named-checkconf V 37 dir 2r-135549.0-196045.r246656/320269 K 15 named-checkzone V 37 dir 2v-135549.0-196045.r231480/460360 K 18 named-journalprint V 38 dir 1q-224093.24-246656.r246656/320664 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 34 dir 24-55505.0-196045.r251535/1963 K 9 newsyslog V 33 dir 2-13245.0-196045.r251533/1896 K 6 nfscbd V 35 dir 4-192811.0-196045.r244072/13522 K 4 nfsd V 33 dir 5s-1558.0-196045.r242038/4462 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 9 nsec3hash V 38 dir 1u-224093.25-246656.r246656/321068 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 33 dir 2-19103.0-196045.r253623/1281 K 8 periodic V 35 dir 2-28113.0-196045.r231480/482324 K 3 pkg V 33 dir 4-234313.0-239563.r252217/805 K 11 pkg_install V 31 dir 2-328.0-196045.r254529/2446 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 35 dir 37-6059.0-196045.r242543/762371 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.r244457/2399 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 32 dir 2-6824.0-196045.r245077/2581 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.r246656/322247 K 12 rndc-confgen V 37 dir 37-135549.0-196045.r246656/323448 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 34 dir 2m-55163.0-196045.r251537/1570 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 34 dir 4-200743.0-201273.r246609/2226 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.r252601/2988 K 7 syslogd V 32 dir 4f-1554.0-196045.r244888/511 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 34 dir 8-141381.0-196045.r247563/3714 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 31 dir 2-2751.0-196045.r247782/906 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 31 dir 2-2089.0-196045.r250730/685 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.r243821/1595 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.r255476/17818 type: dir pred: q-3.0-196045.r255430/16353 count: 12336 text: 255476 6131 11674 11674 3e1f684070a48c301c51cb6db4b2a4f4 props: 252639 17303 613 0 14b72a7c91c54631c1ac5c617f56daf9 cpath: /stable/8/usr.sbin copyroot: 196045 /stable/8 minfo-cnt: 244 minfo-here: y PLAIN K 9 COPYRIGHT V 32 file 1-2656.0-196045.r247537/418 K 5 LOCKS V 35 file 1-146890.0-196045.r247537/1119 K 11 MAINTAINERS V 34 file 1-94742.0-196045.r247537/2022 K 8 Makefile V 33 file 3-1594.0-205747.r252073/2045 K 13 Makefile.inc1 V 35 file 5-38666.0-196045.r251757/50427 K 17 ObsoleteFiles.inc V 35 file 4-148330.0-196045.r252488/1232 K 6 README V 34 file 1-21173.0-196045.r247537/4416 K 8 UPDATING V 33 file 1-41806.0-196045.r254708/329 K 3 bin V 29 dir 1-5.0-196045.r253343/4578 K 4 cddl V 34 dir 1-168404.0-196045.r253903/8515 K 7 contrib V 33 dir 1-16755.0-196045.r254348/9335 K 6 crypto V 34 dir 1-25405.0-196045.r252340/16947 K 3 etc V 31 dir 1-38.0-196045.r254034/16796 K 5 games V 32 dir 1-2491.0-196045.r251320/3599 K 3 gnu V 30 dir 1-3.0-196045.r250677/10360 K 7 include V 32 dir 1-697.0-196045.r251511/13656 K 9 kerberos5 V 34 dir 4q-29815.0-196045.r251722/2851 K 3 lib V 29 dir 6-5.0-196045.r255423/7729 K 7 libexec V 29 dir c-5.0-196045.r250171/4797 K 7 release V 32 dir 1-3027.0-196045.r252120/3255 K 6 rescue V 35 dir 7-117035.0-196045.r251757/84438 K 4 sbin V 31 dir fa-4.0-196045.r252819/11326 K 6 secure V 34 dir r-1553.0-196045.r248360/125988 K 5 share V 30 dir e-3.0-196045.r255433/32753 K 3 sys V 31 dir g-5.0-196045.r255470/201670 K 5 tools V 33 dir 43-1590.0-196045.r254040/5690 K 7 usr.bin V 30 dir m-3.0-196045.r255197/12137 K 8 usr.sbin V 30 dir q-3.0-196045.r255476/17818 END ENDREP id: 5-1.0-196045.r255476/19527 type: dir pred: 5-1.0-196045.r255470/203378 count: 155816 text: 255476 18110 1404 1404 7b439d70fcb748d9df1f4b45837c514d props: 252639 19642 903 0 bf6f227a9f27dcb469d4b85218dba0f5 cpath: /stable/8 copyroot: 196045 /stable/8 minfo-cnt: 1132 minfo-here: y id: d-52400.1-227145.r255476/19812 type: file pred: d-52400.1-227145.r250583/0 count: 96 text: 255476 56 4557 39963 dafa8423415145eb538aabdfb01d26b7 eeaa7571b72a955466f7277bc9a66573878d073c 255475-5h4l/_9 props: 179315 70170 64 0 a0283a89aab39edd4cfb26f6b28671ff cpath: /stable/9/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 31 file b-52400.0-227145.r227145/0 K 14 mergemaster.sh V 35 file d-52400.1-227145.r255476/19812 END ENDREP PLAIN K 13 svn:mergeinfo V 265 /head/usr.sbin/mergemaster:227006,227013,228122,241218,243891-243892,249906,250463,255428 /projects/largeSMP/usr.sbin/mergemaster:221273-222812,222815-223757 /projects/quota64/usr.sbin/mergemaster:184125-207707 /vendor/resolver/dist/usr.sbin/mergemaster:1540-186085 END ENDREP id: 2-52401.0-225736.r255476/20674 type: dir pred: 2-52401.0-225736.r250583/848 count: 142 text: 255476 20187 166 166 11284d2d6cfbb09054b8ed4a8b258e17 props: 255476 20366 295 0 0a805532ad37c27fb4ca3ee3d0195943 cpath: /stable/9/usr.sbin/mergemaster copyroot: 225736 /stable/9 minfo-cnt: 1 minfo-here: y PLAIN K 9 IPXrouted V 27 dir 2-11820.0.r211936/72794 K 8 Makefile V 33 file 24-1553.0-230187.r254966/486 K 14 Makefile.amd64 V 27 file 4-212525.0.r216322/107 K 12 Makefile.arm V 28 file 6-212525.0.r212525/3151 K 13 Makefile.i386 V 28 file 8-212525.0.r212525/2377 K 13 Makefile.ia64 V 27 file a-212525.0.r212525/116 K 12 Makefile.inc V 33 file 27-1553.7-1554.r201390/43477 K 13 Makefile.mips V 28 file c-212525.0.r217942/5825 K 16 Makefile.powerpc V 27 file g-212525.0.r212525/500 K 16 Makefile.sparc64 V 28 file i-212525.0.r212525/1658 K 2 ac V 32 dir b-1554.0-225736.r242891/1542 K 6 accton V 26 dir d-1554.0.r201390/92943 K 4 acpi V 34 dir 1l-65047.0-225736.r251307/1781 K 7 adduser V 32 dir 2-5263.0-225736.r240755/1027 K 3 amd V 33 dir f-1554.0-225736.r231702/14455 K 9 ancontrol V 33 dir 1k-55992.0-225736.r240035/907 K 3 apm V 26 dir 2-3259.0.r211725/77758 K 4 apmd V 34 dir 2-48731.0-225736.r252181/73716 K 3 arp V 34 dir 15-1554.0-225736.r241992/27922 K 8 arpaname V 28 dir w-224093.0.r224093/30864 K 3 asf V 29 dir 2-116009.0.r206622/239756 K 5 audit V 28 dir 4-155213.0.r201390/92261 K 6 auditd V 28 dir 8-155213.0.r204352/20883 K 10 auditdistd V 35 dir l-243752.2-244398.r244398/48190 K 11 auditreduce V 28 dir c-155213.0.r201390/32353 K 6 authpf V 35 dir 18-126385.0-225736.r253320/4477 K 9 bluetooth V 36 dir 58-107120.0-225736.r252181/76682 K 8 boot0cfg V 32 dir 2-44197.0-225736.r231119/812 K 9 boot98cfg V 25 dir 4-64126.0.r174764/566 K 10 bootparamd V 33 dir 2-6752.0-225736.r231702/24816 K 9 bsdconfig V 34 dir 5-252995.0-225736.r254966/2546 K 10 bsdinstall V 34 dir 7-218799.0-225736.r254360/2598 K 6 bsnmpd V 35 dir 1h-122405.0-225736.r252820/3354 K 5 btxld V 27 dir 2-39093.0.r201390/29595 K 6 burncd V 35 dir 7-55522.0-225736.r227305/109209 K 9 cdcontrol V 35 dir 4-10099.0-225736.r237216/193508 K 6 chkgrp V 33 dir 2-36332.0-225736.r244067/1453 K 5 chown V 25 dir 19-1554.0.r208815/619 K 6 chroot V 28 dir 1b-1554.0.r201390/120297 K 6 ckdist V 28 dir 2-21919.0.r213573/161935 K 11 clear_locks V 29 dir 4m-177633.0.r208291/91682 K 6 config V 34 dir 1d-1554.0-225736.r252181/78336 K 10 cpucontrol V 35 dir 19-181430.0-225736.r246281/1687 K 9 crashinfo V 33 dir 4-181335.0-225736.r239431/907 K 4 cron V 32 dir 2-2312.0-225736.r239876/1474 K 6 crunch V 32 dir 2-1723.0-225736.r246895/2726 K 6 ctladm V 35 dir 2y-229997.2-231772.r253835/1565 K 3 ctm V 32 dir 2-2887.0-225736.r229216/1435 K 6 daemon V 32 dir 4-82547.0-225736.r245993/827 K 9 dconschat V 34 dir 1b-121468.0-225736.r233299/508 K 12 ddns-confgen V 29 dir 10-224093.0.r224093/32655 K 7 devinfo V 28 dir 2-75752.0.r206622/236953 K 7 digictl V 28 dir 3i-76195.0.r201390/93589 K 8 diskinfo V 36 dir 4-113287.0-225736.r242544/145410 K 16 dnssec-dsfromkey V 29 dir pk-193149.0.r201390/41428 K 19 dnssec-keyfromlabel V 29 dir po-193149.0.r201390/47803 K 13 dnssec-keygen V 28 dir u-135569.0.r201390/21654 K 13 dnssec-revoke V 29 dir 14-224093.0.r224093/28509 K 14 dnssec-settime V 29 dir 18-224093.0.r224093/34830 K 15 dnssec-signzone V 28 dir y-135569.0.r224093/29048 K 13 dnssec-verify V 37 dir aj-254651.h-254897.r254897/227751 K 7 dumpcis V 28 dir 4-185032.0.r201390/73525 K 7 editmap V 27 dir 4-90797.0.r201390/77638 K 7 edquota V 34 dir 1n-1554.0-225736.r242166/30604 K 6 eeprom V 27 dir 2-129590.0.r203972/5080 K 7 extattr V 27 dir 2-102607.0.r208004/1250 K 10 extattrctl V 26 dir 4-59247.0.r216292/1234 K 6 faithd V 26 dir 1y-56668.0.r224609/890 K 9 fdcontrol V 25 dir 2-4008.0.r208593/2092 K 8 fdformat V 25 dir 2-1023.0.r218910/2945 K 6 fdread V 25 dir 2-76590.0.r223197/677 K 7 fdwrite V 27 dir 2-2850.0.r206622/243871 K 7 fifolog V 27 dir 2-176998.0.r219123/3574 K 7 flowctl V 35 dir 4-135380.0-225736.r237247/48602 K 14 freebsd-update V 35 dir h-161748.0-225736.r237247/47409 K 9 ftp-proxy V 29 dir 18-171173.0.r223637/62145 K 9 fwcontrol V 34 dir 4-108441.0-225736.r229899/1393 K 9 genrandom V 29 dir 1e-224093.0.r224093/32035 K 7 getfmac V 29 dir 4-105756.0.r201390/123934 K 7 getpmac V 28 dir c-105756.0.r201390/94242 K 7 gpioctl V 36 dir 4-213238.0-225736.r237216/183520 K 4 gssd V 35 dir 63-184588.0-225736.r252675/1087 K 5 gstat V 29 dir 4-112444.0.r201390/130013 K 3 i2c V 35 dir 4-187712.0-225736.r237247/49649 K 8 ifmcstat V 34 dir 1i-55163.0-225736.r253243/1152 K 5 inetd V 33 dir 1r-1554.0-225736.r246402/1114 K 6 iostat V 32 dir 1t-1554.0-225736.r229218/775 K 10 ip6addrctl V 34 dir 4-121748.0-225736.r241428/1321 K 8 ipfwpcap V 28 dir 2-151427.0.r201390/64389 K 14 isc-hmac-fixup V 29 dir 1i-224093.0.r224093/29707 K 4 jail V 35 dir 2o-46155.0-225736.r252181/80122 K 5 jexec V 28 dir b-113277.0.r201390/85285 K 3 jls V 34 dir j-113277.0-225736.r253156/1167 K 10 kbdcontrol V 33 dir 2-2088.0-225736.r252181/81584 K 6 kbdmap V 31 dir 2-7303.0-225736.r237421/939 K 7 keyserv V 34 dir 2-26235.0-225736.r231702/22358 K 5 kgmon V 34 dir 1v-1554.0-225736.r242166/31828 K 5 kgzip V 28 dir 2-48906.0.r140442/132774 K 7 kldxref V 33 dir 4-83322.0-225736.r252044/1342 K 9 lastlogin V 26 dir 4-68723.0.r222767/2270 K 9 lmcconfig V 27 dir f-150850.0.r216600/2798 K 3 lpr V 33 dir z-1553.0-225736.r242166/32502 K 10 lptcontrol V 27 dir 2-2471.0.r201390/121864 K 9 mailstats V 28 dir 2-38095.0.r201390/103671 K 11 mailwrapper V 25 dir 7-54817.0.r213749/710 K 6 makefs V 34 dir 1-185222.0-226275.r254545/1749 K 7 makemap V 28 dir 2-38097.0.r201390/144851 K 6 manctl V 26 dir 2-1367.0.r99968/128409 K 10 memcontrol V 32 dir 2-45411.0-225736.r242022/958 K 11 mergemaster V 34 dir 2-52401.0-225736.r255476/20674 K 7 mfiutil V 34 dir e-196200.0-225736.r255429/3440 K 5 mixer V 31 dir 2-6449.0-225736.r230982/884 K 9 mld6query V 26 dir 2-62915.0.r216586/2061 K 10 mlxcontrol V 34 dir 2-59139.0-225736.r231772/22192 K 10 mount_nwfs V 26 dir c-52252.0.r204710/1189 K 14 mount_portalfs V 28 dir 4p-1558.0.r208027/118283 K 11 mount_smbfs V 27 dir q-87874.0.r201390/21092 K 6 mountd V 33 dir 5g-1558.0-225736.r247394/1413 K 6 moused V 35 dir 2-16566.0-225736.r250078/121318 K 7 mptable V 27 dir 2-25265.0.r208291/88601 K 7 mptutil V 36 dir 4-196212.0-225736.r237216/195102 K 5 mtest V 26 dir 2-20530.0.r223510/4828 K 5 mtree V 34 dir 2j-1554.0-225736.r245462/30154 K 5 named V 34 dir 2-2981.0-225736.r254402/186681 K 15 named-checkconf V 29 dir 2r-135549.0.r224093/34168 K 15 named-checkzone V 29 dir 2v-135549.0.r201390/69633 K 18 named-journalprint V 29 dir 1q-224093.0.r224093/33285 K 7 ndiscvt V 35 dir 2-123475.0-225736.r252181/83049 K 3 ndp V 34 dir 24-55505.0-225736.r251534/1559 K 9 newsyslog V 33 dir 2-13245.0-225736.r251532/1621 K 6 nfscbd V 35 dir 4-192811.0-225736.r244074/15335 K 4 nfsd V 33 dir 5s-1558.0-225736.r252676/1467 K 12 nfsdumpstate V 26 dir c-192811.0.r210272/549 K 9 nfsrevoke V 27 dir k-192811.0.r193070/4553 K 8 nfsuserd V 27 dir s-192811.0.r223382/1326 K 5 ngctl V 27 dir 8t-52419.0.r216588/2827 K 6 nghook V 28 dir 9n-52419.0.r201390/67815 K 6 nmtree V 35 dir 5-244562.4-245462.r245462/30754 K 7 nologin V 26 dir 60-1558.0.r169439/1113 K 4 nscd V 29 dir 3q-158115.0.r208291/90999 K 9 nsec3hash V 29 dir 1u-224093.0.r224093/35453 K 3 ntp V 34 dir 2-54552.0-225736.r235586/23976 K 5 nvram V 29 dir 11-160892.0.r201390/17856 K 7 ofwdump V 29 dir 2-105401.0.r201390/129367 K 13 pc-sysinstall V 34 dir 7-209513.0-225736.r240315/6011 K 7 pciconf V 33 dir 2-19103.0-225736.r253622/1700 K 8 periodic V 28 dir 2-28113.0.r206622/236303 K 3 pkg V 34 dir 4-234313.0-235112.r252216/1073 K 11 pkg_install V 31 dir 2-328.0-225736.r254528/2032 K 11 pmcannotate V 26 dir 4-185347.0.r213928/535 K 10 pmccontrol V 35 dir 31-145256.0-225736.r237969/1392 K 7 pmcstat V 35 dir 39-145256.0-225736.r240093/2737 K 7 pnpinfo V 27 dir 2-29619.0.r201390/63741 K 8 portsnap V 34 dir h-148871.0-225736.r253337/4782 K 6 powerd V 34 dir 2-142577.0-225736.r253213/1989 K 3 ppp V 35 dir 37-6059.0-225736.r242544/152256 K 6 pppctl V 28 dir 4-27008.0.r206622/238921 K 9 praliases V 27 dir 2-38096.0.r201390/18412 K 7 praudit V 29 dir g-155213.0.r201390/107729 K 7 procctl V 27 dir b-31565.0.r201390/25635 K 5 pstat V 27 dir 2n-1554.0.r201390/69070 K 2 pw V 33 dir 2-20254.0-225736.r253157/1876 K 8 pwd_mkdb V 25 dir 2p-1554.0.r223818/638 K 4 quot V 27 dir 2r-1554.0.r217769/22422 K 7 quotaon V 27 dir 2t-1554.0.r207736/40088 K 5 rarpd V 32 dir 2-6824.0-225736.r251083/2141 K 8 repquota V 27 dir 2v-1554.0.r207736/41517 K 9 rip6query V 28 dir 1y-55163.0.r201390/36249 K 3 rmt V 27 dir 2x-1554.0.r201390/71905 K 4 rndc V 29 dir 33-135549.0.r224093/31390 K 12 rndc-confgen V 29 dir 37-135549.0.r224093/27853 K 7 route6d V 34 dir 26-55163.0-225736.r251724/6634 K 9 rpc.lockd V 34 dir 5-14124.0-225736.r231702/15863 K 9 rpc.statd V 34 dir 5-14126.0-225736.r231702/18595 K 11 rpc.umntall V 27 dir 4-53494.0.r201390/54196 K 13 rpc.yppasswdd V 34 dir 2-14063.0-225736.r231702/17269 K 13 rpc.ypupdated V 34 dir 2-26237.0-225736.r231702/21089 K 10 rpc.ypxfrd V 34 dir 2-16126.0-225736.r231702/26070 K 7 rpcbind V 27 dir 7c-74462.0.r224001/3013 K 7 rrenumd V 35 dir 2e-55505.0-225736.r252181/84531 K 8 rtadvctl V 35 dir 6-224006.a-227305.r237247/45000 K 6 rtadvd V 34 dir 2u-55505.0-225736.r255388/2573 K 6 rtprio V 31 dir 4-2447.0-225736.r241171/771 K 6 rtsold V 34 dir 2m-55163.0-225736.r251536/1333 K 5 rwhod V 34 dir 2z-1554.0-225736.r240582/41547 K 2 sa V 31 dir 2-3126.0-225736.r229242/962 K 4 sade V 32 dir 5-8098.0-225736.r229243/2635 K 8 sendmail V 34 dir 31-1554.0-225736.r247333/28218 K 7 service V 35 dir 4-200743.0-225736.r246609/17014 K 13 services_mkdb V 26 dir 4-206156.0.r213442/843 K 6 setfib V 37 dir 2l-178888.0-225736.r237216/202571 K 7 setfmac V 29 dir i-105756.0.r206622/242441 K 7 setpmac V 29 dir q-105756.0.r206622/237616 K 9 sicontrol V 26 dir 2-10045.0.r179668/2667 K 6 smbmsg V 35 dir 2-129331.0-225736.r237247/46287 K 8 snapinfo V 28 dir 2-148197.0.r208291/93628 K 8 spkrtest V 24 dir 2-3763.0.r217364/516 K 5 spray V 25 dir 2-13243.0.r100121/936 K 10 sysinstall V 32 dir 8-8098.0-225736.r252600/3119 K 7 syslogd V 33 dir 4f-1554.0-225736.r250232/1566 K 5 sysrc V 36 dir c8-252995.0-225736.r252995/91691 K 7 tcpdchk V 27 dir 4-44747.0.r201390/17211 K 9 tcpdmatch V 27 dir 8-44747.0.r201390/26861 K 7 tcpdrop V 34 dir 8-141381.0-225736.r247562/1305 K 7 tcpdump V 30 dir u-3.0-225736.r252283/37987 K 5 timed V 33 dir 4h-1554.0-225736.r240626/2173 K 10 traceroute V 26 dir 4t-1554.0.r216184/6263 K 11 traceroute6 V 33 dir 34-55163.0-225736.r237488/912 K 4 trpt V 26 dir 4v-1554.0.r189090/9126 K 7 tzsetup V 31 dir 2-2751.0-225736.r247781/497 K 8 uathload V 26 dir t-190688.0.r218749/778 K 6 ugidfw V 28 dir 4-101209.0.r210641/39595 K 7 uhsoctl V 33 dir r-202181.0-225736.r229249/752 K 9 usbconfig V 36 dir j4-184610.0-225736.r247475/64956 K 7 usbdump V 34 dir 2-215651.0-225736.r235003/1112 K 5 utxrm V 35 dir 8-218847.0-225736.r237247/50505 K 10 vidcontrol V 32 dir 2-2089.0-225736.r250729/1111 K 4 vipw V 32 dir 51-1554.0-225736.r232406/799 K 4 wake V 33 dir 4-195200.0-225736.r232775/766 K 5 watch V 31 dir 9-6521.0-225736.r233083/764 K 9 watchdogd V 34 dir n-116874.0-225736.r243820/1310 K 9 wlandebug V 37 dir 12-153317.0-225736.r237216/187720 K 8 wlconfig V 28 dir 2-26006.0.r201390/109108 K 3 wpa V 34 dir 2-147020.0-225736.r250727/2300 K 7 yp_mkdb V 32 dir 2-15424.0-225736.r229250/785 K 6 ypbind V 31 dir 2-1927.0-225736.r233259/860 K 6 yppoll V 25 dir 4-1929.0.r203972/4033 K 6 yppush V 34 dir 2-13395.0-225736.r231702/27238 K 6 ypserv V 33 dir 2-12892.0-225736.r233259/2499 K 5 ypset V 26 dir a-1929.0.r201390/24997 K 3 zic V 34 dir 2-2703.0-225736.r227305/110443 K 3 zzz V 28 dir 2-117557.0.r130420/15225 END ENDREP id: q-3.0-225736.r255476/32490 type: dir pred: q-3.0-225736.r255429/15250 count: 13060 text: 255476 20977 11500 11500 b2ec466c4f2d3db54945d247a09e160f props: 254966 14359 450 0 5c82a979df9dca2980df14e83f12ba7b cpath: /stable/9/usr.sbin copyroot: 225736 /stable/9 minfo-cnt: 131 minfo-here: y PLAIN K 9 COPYRIGHT V 32 file 1-2656.0-225736.r244901/698 K 5 LOCKS V 27 file 1-146890.0.r179574/251 K 11 MAINTAINERS V 33 file 1-94742.0-225736.r242112/705 K 8 Makefile V 32 file 3-1594.0-227879.r252588/600 K 13 Makefile.inc1 V 34 file 5-38666.0-225736.r253164/1585 K 13 Makefile.mips V 29 file 3-209509.0.r217123/14692 K 17 ObsoleteFiles.inc V 36 file 4-148330.0-225736.r252723/30426 K 6 README V 35 file 1-21173.0-225736.r250458/55147 K 8 UPDATING V 33 file 1-41806.0-225736.r254707/329 K 3 bin V 29 dir 1-5.0-225736.r255065/6038 K 4 cddl V 34 dir 1-168404.0-225736.r253901/7223 K 7 contrib V 34 dir 1-16755.0-225736.r255252/44075 K 6 crypto V 34 dir 1-25405.0-225736.r254554/16188 K 3 etc V 30 dir 1-38.0-225736.r255394/6679 K 5 games V 32 dir 1-2491.0-225736.r251319/3171 K 3 gnu V 29 dir 1-3.0-225736.r253216/3277 K 7 include V 31 dir 1-697.0-225736.r255306/6080 K 9 kerberos5 V 34 dir 4q-29815.0-225736.r250690/2800 K 3 lib V 31 dir 6-5.0-225736.r254897/209608 K 7 libexec V 29 dir c-5.0-225736.r250170/5137 K 7 release V 32 dir 1-3027.0-225736.r254075/2384 K 6 rescue V 34 dir 7-117035.0-225736.r251642/1271 K 4 sbin V 30 dir fa-4.0-225736.r255017/8316 K 6 secure V 33 dir r-1553.0-225736.r251135/59710 K 5 share V 30 dir e-3.0-225736.r255432/32204 K 3 sys V 30 dir g-5.0-225736.r255443/35568 K 5 tools V 33 dir 43-1590.0-225736.r255066/6974 K 7 usr.bin V 30 dir m-3.0-225736.r255233/15301 K 8 usr.sbin V 30 dir q-3.0-225736.r255476/32490 END ENDREP id: 5-1.0-225736.r255476/34241 type: dir pred: 5-1.0-225736.r255443/37313 count: 167245 text: 255476 32783 1445 1445 68354861a865d4d5abd4fe6aa09326c8 props: 254398 138288 1138 0 77607f3cce0c2a3774f2c9082571993f cpath: /stable/9 copyroot: 225736 /stable/9 minfo-cnt: 624 minfo-here: y PLAIN K 5 2.0.5 V 28 dir 5-1.0-8869.r250544/29954 K 3 2.1 V 28 dir 5-1.0-9211.r250544/32624 K 3 2.2 V 29 dir 5-1.0-19327.r250544/35522 K 1 3 V 29 dir 5-1.0-42951.r250544/39131 K 1 4 V 29 dir 5-1.0-57955.r250544/43341 K 1 5 V 30 dir 5-1.0-133968.r250544/74288 K 1 6 V 29 dir 5-1.0-147906.r253012/6879 K 1 7 V 30 dir 5-1.0-172506.r254349/11020 K 1 8 V 30 dir 5-1.0-196045.r255476/19527 K 1 9 V 30 dir 5-1.0-225736.r255476/34241 END ENDREP id: 9-1.0.r255476/34963 type: dir pred: 9-1.0.r255470/204102 count: 56434 text: 255476 34526 424 424 ca570761e1b934aef745b4d6a45e003f cpath: /stable copyroot: 0 / minfo-cnt: 2378 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.r255475/15325 K 8 projects V 25 dir 6-1.0.r255464/1103180 K 7 release V 22 dir 7-1.0.r251259/2845 K 6 releng V 23 dir 8-1.0.r255465/11839 K 6 stable V 23 dir 9-1.0.r255476/34963 K 8 svnadmin V 27 dir 0-179447.0.r255382/1322 K 4 user V 23 dir a-1.0.r255473/22025 K 6 vendor V 23 dir b-1.0.r255387/33839 K 13 vendor-crypto V 26 dir 0-1575.0.r254277/20065 K 10 vendor-sys V 27 dir 0-12116.0.r255260/28615 END ENDREP id: 0.0.r255476/35677 type: dir pred: 0.0.r255475/16111 count: 255476 text: 255476 35143 521 521 dfde592d4bdb0b89ed82d5eb4f074f8b props: 254474 0 3820 0 5ba9c173df0952cf5e34e8d9b314fd8a cpath: / copyroot: 0 / minfo-cnt: 36423 2-52401.0-196045.t255475-5h4l modify-dir false true /stable/8/usr.sbin/mergemaster d-52400.1-202337.t255475-5h4l modify-file true false /stable/8/usr.sbin/mergemaster/mergemaster.sh 2-52401.0-225736.t255475-5h4l modify-dir false true /stable/9/usr.sbin/mergemaster d-52400.1-227145.t255475-5h4l modify-file true false /stable/9/usr.sbin/mergemaster/mergemaster.sh 35677 35904