id: d-52400.1-227145.r241337/0
type: file
pred: d-52400.1-227145.r228169/0
count: 90
text: 241218 0 1064 40311 f4baa99ec1cfeaaa50f67d3303dd7eb1 51da8190aa98def080e371398e60bf20ce8d3ce5 241336-567s/_5
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 31
file d-52400.1-227145.r241337/0
END
ENDREP
PLAIN
K 13
svn:mergeinfo
V 230
/head/usr.sbin/mergemaster:227006,227013,228122,241218
/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.r241337/818
type: dir
pred: 2-52401.0-225736.r228169/812
count: 136
text: 241337 370 162 162 7b3862db3f20fcd90fe51c0b1352e2e1
props: 241337 545 260 0 7b4bede91bb91b53b0ba92cb4ca099a9
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 32
file 24-1553.0-230187.r235112/64
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 33
dir b-1554.0-225736.r240582/40351
K 6
accton
V 26
dir d-1554.0.r201390/92943
K 4
acpi
V 34
dir 1l-65047.0-225736.r237232/1692
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 27
dir 2-48731.0.r215676/23816
K 3
arp
V 32
dir 15-1554.0-225736.r237774/899
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 11
auditreduce
V 28
dir c-155213.0.r201390/32353
K 6
authpf
V 29
dir 18-126385.0.r201390/31802
K 9
bluetooth
V 37
dir 58-107120.0-225736.r237216/171786
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 10
bsdinstall
V 33
dir 7-218799.0-225736.r239782/722
K 6
bsnmpd
V 35
dir 1h-122405.0-225736.r241003/3508
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 27
dir 2-36332.0.r201390/74783
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 35
dir 1d-1554.0-225736.r237216/186518
K 10
cpucontrol
V 35
dir 19-181430.0-225736.r237837/1147
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.r237424/1659
K 6
ctladm
V 35
dir 2y-229997.2-231772.r239518/1033
K 3
ctm
V 32
dir 2-2887.0-225736.r229216/1435
K 6
daemon
V 33
dir 4-82547.0-225736.r236970/1146
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 26
dir 4-113287.0.r224250/912
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 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 35
dir 1n-1554.0-225736.r237216/196387
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 36
dir 63-184588.0-225736.r231702/19652
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.r239935/1023
K 5
inetd
V 34
dir 1r-1554.0-225736.r236875/30845
K 6
iostat
V 32
dir 1t-1554.0-225736.r229218/775
K 10
ip6addrctl
V 28
dir 4-121748.0.r201390/84635
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 34
dir 2o-46155.0-225736.r239892/1423
K 5
jexec
V 28
dir b-113277.0.r201390/85285
K 3
jls
V 33
dir j-113277.0-225736.r235700/827
K 10
kbdcontrol
V 26
dir 2-2088.0.r215676/22870
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 25
dir 1v-1554.0.r160022/607
K 5
kgzip
V 28
dir 2-48906.0.r140442/132774
K 7
kldxref
V 33
dir 4-83322.0-225736.r237415/1293
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 32
dir z-1553.0-225736.r240322/4769
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.r234055/2723
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 28
dir 2-45411.0.r201390/113175
K 11
mergemaster
V 32
dir 2-52401.0-225736.r241337/818
K 7
mfiutil
V 34
dir e-196200.0-225736.r237589/4659
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.r241038/1209
K 6
moused
V 33
dir 2-16566.0-225736.r241084/7017
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 33
dir 2j-1554.0-225736.r229888/7667
K 5
named
V 27
dir 2-2981.0.r225361/149152
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 34
dir 2-123475.0-225736.r229228/1462
K 3
ndp
V 26
dir 24-55505.0.r219819/550
K 9
newsyslog
V 33
dir 2-13245.0-225736.r238520/2079
K 6
nfscbd
V 29
dir 4-192811.0.r211397/125353
K 4
nfsd
V 27
dir 5s-1558.0.r223492/26533
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 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 34
dir 2-19103.0-225736.r241101/45312
K 8
periodic
V 28
dir 2-28113.0.r206622/236303
K 3
pkg
V 33
dir 4-234313.0-235112.r240290/897
K 11
pkg_install
V 32
dir 2-328.0-225736.r241135/11430
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.r241106/1678
K 6
powerd
V 27
dir 2-142577.0.r211415/1936
K 3
ppp
V 33
dir 37-6059.0-225736.r234263/6516
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.r229364/1758
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 24
dir 2-6824.0.r216225/664
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 33
dir 26-55163.0-225736.r229239/839
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 28
dir 2e-55505.0.r201390/65243
K 8
rtadvctl
V 35
dir 6-224006.a-227305.r237247/45000
K 6
rtadvd
V 35
dir 2u-55505.0-225736.r237247/57334
K 6
rtprio
V 31
dir 4-2447.0-225736.r241171/771
K 6
rtsold
V 36
dir 2m-55163.0-225736.r227305/105971
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.r232930/25752
K 7
service
V 26
dir 4-200743.0.r224672/529
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.r234737/5604
K 7
syslogd
V 32
dir 4f-1554.0-225736.r233007/926
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 27
dir 8-141381.0.r222765/2653
K 7
tcpdump
V 31
dir u-3.0-225736.r240579/127084
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 34
dir 2-2751.0-225736.r227305/107562
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 29
dir j4-184610.0.r219048/27749
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.r238158/6516
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 33
dir n-116874.0-225736.r240242/965
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.r238662/1815
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.r241337/12221
type: dir
pred: q-3.0-225736.r241171/12166
count: 12889
text: 241337 1115 11093 11093 da69135e44c0177427dd01c65893dc0b
props: 241084 18416 345 0 f29ce062c99490d44e216376075b41c3
cpath: /stable/9/usr.sbin
copyroot: 225736 /stable/9
minfo-cnt: 108
minfo-here: y

PLAIN
K 9
COPYRIGHT
V 30
file 1-2656.0-225736.r229068/0
K 5
LOCKS
V 27
file 1-146890.0.r179574/251
K 11
MAINTAINERS
V 33
file 1-94742.0-225736.r240432/353
K 8
Makefile
V 32
file 3-1594.0-227879.r231941/266
K 13
Makefile.inc1
V 31
file 5-38666.0-225736.r241193/0
K 13
Makefile.mips
V 29
file 3-209509.0.r217123/14692
K 17
ObsoleteFiles.inc
V 35
file 4-148330.0-225736.r239476/1596
K 6
README
V 26
file 1-21173.0.r215293/415
K 8
UPDATING
V 34
file 1-41806.0-225736.r241189/1124
K 3
bin
V 29
dir 1-5.0-225736.r241320/3541
K 4
cddl
V 34
dir 1-168404.0-225736.r240959/7127
K 7
contrib
V 34
dir 1-16755.0-225736.r240897/57223
K 6
crypto
V 35
dir 1-25405.0-225736.r237998/106965
K 3
etc
V 31
dir 1-38.0-225736.r241277/13337
K 5
games
V 32
dir 1-2491.0-225736.r241240/3178
K 3
gnu
V 30
dir 1-3.0-225736.r241193/11281
K 7
include
V 31
dir 1-697.0-225736.r241309/7507
K 9
kerberos5
V 35
dir 4q-29815.0-225736.r241193/14457
K 3
lib
V 30
dir 6-5.0-225736.r241316/20151
K 7
libexec
V 29
dir c-5.0-225736.r241226/3097
K 7
release
V 34
dir 1-3027.0-225736.r241122/138214
K 6
rescue
V 35
dir 7-117035.0-225736.r241193/15663
K 4
sbin
V 30
dir fa-4.0-225736.r241223/6667
K 6
secure
V 34
dir r-1553.0-225736.r237998/234277
K 5
share
V 30
dir e-3.0-225736.r241318/24134
K 3
sys
V 30
dir g-5.0-225736.r241334/33500
K 5
tools
V 33
dir 43-1590.0-225736.r240907/5785
K 7
usr.bin
V 30
dir m-3.0-225736.r241227/13331
K 8
usr.sbin
V 30
dir q-3.0-225736.r241337/12221
END
ENDREP
id: 5-1.0-225736.r241337/13964
type: dir
pred: 5-1.0-225736.r241334/35238
count: 165069
text: 241337 12513 1438 1438 eb6678b810dfa28bad4329f12aed10d3
props: 241192 59667 767 0 6dc267aa0a02118689cc4b400b8acc02
cpath: /stable/9
copyroot: 225736 /stable/9
minfo-cnt: 487
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.r241335/94877
K 1
9
V 30
dir 5-1.0-225736.r241337/13964
END
ENDREP
id: 9-1.0.r241337/14679
type: dir
pred: 9-1.0.r241335/95594
count: 53081
text: 241337 14247 419 419 a52ce5fc22934fd3202e58528d6e1249
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.r241337/14679
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.r241337/15387
type: dir
pred: 0.0.r241336/19753
count: 241337
text: 241337 14858 516 516 789696e8e208f40f16d4fc80bf0e984c
cpath: /
copyroot: 0 /
minfo-cnt: 27578

2-52401.0-225736.t241336-567s modify-dir false true /stable/9/usr.sbin/mergemaster

d-52400.1-227145.t241336-567s modify-file true false /stable/9/usr.sbin/mergemaster/mergemaster.sh


15387 15558