DELTA 245803 13048 3782 SVN.  v?zK3z~ EE ALSO .Xr fdt 4are merged. All nodes that are present in the second but not the first are imported. Any that appear in both are recursively merged, with properties from the second replacing those from the first and properties child nodes being recursively merged.ENDREP id: r-245803.0.r245815/336 type: file pred: r-245803.0.r245809/308 count: 2 text: 245815 0 305 10016 e2c7f5d67edfdedefe38746e75493dbd 008817ee25de8c1d98f198979dcc3bd923afdc09 245814-59o6/_4 props: 245803 58997 38 0 b6b34f029ed66be42751a530d6e4b830 cpath: /head/usr.bin/dtc/dtc.1 copyroot: 0 / PLAIN K 7 HACKING V 29 file e-245803.0.r245803/57105 K 8 Makefile V 29 file h-245803.0.r245803/57427 K 11 checking.cc V 29 file j-245803.0.r245803/57749 K 11 checking.hh V 29 file l-245803.0.r245803/58076 K 6 dtb.cc V 29 file n-245803.0.r245803/58403 K 6 dtb.hh V 29 file p-245803.0.r245803/58725 K 5 dtc.1 V 27 file r-245803.0.r245815/336 K 6 dtc.cc V 26 file t-245803.0.r245807/55 K 6 fdt.cc V 29 file v-245803.0.r245803/59693 K 6 fdt.hh V 29 file x-245803.0.r245803/60017 K 15 input_buffer.cc V 29 file z-245803.0.r245803/60341 K 15 input_buffer.hh V 30 file 11-245803.0.r245803/60674 K 9 string.cc V 30 file 13-245803.0.r245803/61008 K 9 string.hh V 30 file 15-245803.0.r245803/61336 K 7 util.hh V 30 file 17-245803.0.r245803/61664 END ENDREP id: c-245803.0.r245815/1377 type: dir pred: c-245803.0.r245809/1351 count: 3 text: 245815 630 734 734 62ef7d583f6a346d408bf4c3d0514e7d cpath: /head/usr.bin/dtc copyroot: 0 / PLAIN K 8 Makefile V 32 file 5q-1590.0-1591.r241862/3080 K 14 Makefile.amd64 V 29 file 2-212526.0.r241680/98123 K 12 Makefile.arm V 28 file 5-212526.0.r212526/2042 K 13 Makefile.i386 V 29 file 7-212526.0.r241680/98422 K 13 Makefile.ia64 V 29 file 9-212526.0.r241680/98720 K 12 Makefile.inc V 33 file 5t-1590.1-1591.r201386/42048 K 16 Makefile.powerpc V 29 file b-212526.0.r241680/99013 K 16 Makefile.sparc64 V 29 file d-212526.0.r241680/99311 K 5 alias V 26 dir 4-100200.0.r207196/878 K 5 apply V 24 dir 3-1591.0.r245048/615 K 2 ar V 26 dir 2-176434.0.r241827/840 K 3 asa V 27 dir 2-96625.0.r146466/40996 K 2 at V 25 dir 2-941.0.r241852/14942 K 3 atf V 30 dir 30-241823.0.r241823/111060 K 3 atm V 28 dir 4-121666.0.r201386/17000 K 3 awk V 26 dir 7-85724.0.r201989/1518 K 6 banner V 24 dir 8-1591.0.r227152/748 K 8 basename V 27 dir a-1591.0.r216370/118956 K 2 bc V 26 dir 8-202719.0.r243075/698 K 4 biff V 27 dir e-1591.0.r216370/149816 K 9 bluetooth V 29 dir 4v-107120.0.r201386/26311 K 5 bmake V 28 dir c-241279.0.r243115/13044 K 8 brandelf V 25 dir 2-18962.0.r229908/539 K 6 bsdiff V 29 dir 4-148771.0.r233648/110233 K 5 bzip2 V 28 dir 4-78562.0.r201386/106312 K 12 bzip2recover V 28 dir 4-108667.0.r139103/39421 K 3 c89 V 26 dir 2-29545.0.r216756/2195 K 3 c99 V 27 dir 4-104615.0.r227153/1221 K 8 calendar V 25 dir i-1591.0.r245447/6340 K 8 cap_mkdb V 25 dir m-1591.0.r227154/1404 K 6 catman V 25 dir 4-96845.0.r227155/504 K 4 chat V 26 dir 2-4375.0.r241737/49104 K 7 checknr V 25 dir o-1591.0.r227234/1090 K 5 chkey V 26 dir 2-26241.0.r231994/4531 K 6 chpass V 24 dir s-1591.0.r243081/867 K 5 cksum V 26 dir u-1591.0.r241777/23235 K 5 clang V 29 dir 9d-208963.0.r244628/71068 K 3 cmp V 24 dir w-1591.0.r227156/811 K 3 col V 25 dir y-1591.0.r227157/1555 K 6 colcrt V 25 dir 10-1591.0.r227158/677 K 7 colldef V 25 dir 2-6528.0.r215676/1177 K 5 colrm V 28 dir 12-1591.0.r216370/176883 K 6 column V 25 dir 14-1591.0.r227159/966 K 4 comm V 27 dir 16-1591.0.r233648/99335 K 10 compile_et V 27 dir 2t-3238.0.r233294/57936 K 8 compress V 27 dir 18-1591.0.r229403/38601 K 4 cpio V 29 dir 2-179323.0.r238856/244448 K 6 cpuset V 26 dir 2-176732.0.r227160/893 K 6 csplit V 26 dir 4-95926.0.r227161/1035 K 4 csup V 27 dir 2-156233.0.r241835/3946 K 5 ctags V 28 dir 1e-1591.0.r216370/111927 K 7 ctlstat V 29 dir 2o-229997.0.r241737/49754 K 3 cut V 25 dir 1i-1591.0.r243474/488 K 2 dc V 27 dir u-202719.0.r244861/2917 K 3 dig V 26 dir 2-2987.0.r201386/49598 K 7 dirname V 28 dir 1q-1591.0.r216370/198947 K 3 dtc V 27 dir c-245803.0.r245815/1377 K 2 du V 25 dir 1s-1591.0.r242551/954 K 2 ee V 26 dir 2-10453.0.r203699/4518 K 8 elf2aout V 25 dir 2-93310.0.r203799/962 K 7 elfdump V 28 dir 2-109313.0.r241737/50409 K 6 enigma V 26 dir 2-40768.0.r231994/3214 K 3 env V 28 dir 1u-1591.0.r216370/141416 K 6 expand V 25 dir 1y-1591.0.r227238/591 K 5 false V 28 dir 20-1591.0.r216370/224951 K 5 fetch V 25 dir 2-16505.0.r244058/504 K 4 file V 26 dir 22-1591.0.r234449/8564 K 6 file2c V 26 dir 2-5996.0.r201386/63337 K 4 find V 26 dir 24-1591.0.r243280/1472 K 6 finger V 27 dir 26-1591.0.r241737/52173 K 3 fmt V 28 dir 28-1591.0.r216370/165547 K 4 fold V 25 dir 2a-1591.0.r227165/623 K 4 from V 28 dir 2e-1591.0.r216370/148795 K 5 fstat V 26 dir 2i-1591.0.r235642/2458 K 5 fsync V 27 dir 4-63499.0.r201386/41314 K 3 ftp V 26 dir 2k-1591.0.r223328/4391 K 5 gcore V 26 dir 4o-1590.0.r223924/2753 K 6 gencat V 26 dir 2-7496.0.r241737/52812 K 7 getconf V 26 dir 4-59632.0.r164945/1123 K 6 getent V 26 dir 4-158287.0.r240954/783 K 6 getopt V 23 dir 2-194.0.r217890/789 K 5 gprof V 26 dir 4s-1590.0.r235975/1700 K 4 grep V 26 dir d-210389.0.r245688/784 K 4 gzip V 28 dir k-166255.0.r241737/56044 K 4 head V 28 dir 2u-1591.0.r216370/271750 K 7 hesinfo V 28 dir 2l-65532.0.r141580/21770 K 7 hexdump V 27 dir 2w-1591.0.r233992/11502 K 4 host V 26 dir 2-2989.0.r201386/98769 K 5 iconv V 29 dir 1o9-219019.0.r222772/1020 K 2 id V 25 dir 2y-1591.0.r227203/701 K 6 indent V 26 dir 30-1591.0.r244578/1067 K 5 ipcrm V 26 dir 2-2736.0.r235211/19449 K 4 ipcs V 26 dir 2-2731.0.r228992/48256 K 4 join V 25 dir 32-1591.0.r235597/501 K 3 jot V 26 dir 34-1591.0.r233456/7019 K 5 kdump V 26 dir 36-1591.0.r242482/1150 K 8 keylogin V 28 dir 2-26243.0.r201386/100633 K 9 keylogout V 25 dir 2-26245.0.r194791/653 K 7 killall V 24 dir 2-9317.0.r237847/523 K 6 ktrace V 26 dir 38-1591.0.r236357/1137 K 7 ktrdump V 27 dir 2-93504.0.r243046/37369 K 3 lam V 25 dir 3a-1591.0.r227240/757 K 4 last V 27 dir 3c-1591.0.r240506/24102 K 8 lastcomm V 26 dir 3e-1591.0.r235541/1949 K 3 ldd V 26 dir 2v-696.0.r223262/21187 K 5 leave V 26 dir 3i-1591.0.r226361/1416 K 4 less V 25 dir 4-60789.0.r243834/689 K 8 lessecho V 25 dir c-60789.0.r161480/534 K 7 lesskey V 26 dir g-60789.0.r74848/10425 K 3 lex V 27 dir 2-2259.0.r240518/121169 K 6 limits V 27 dir 2-21924.0.r235211/11082 K 6 locale V 26 dir 2-105239.0.r243202/724 K 6 locate V 26 dir 3k-1591.0.r244063/1538 K 4 lock V 27 dir 3s-1591.0.r241848/12832 K 5 lockf V 28 dir 2-21440.0.r233648/110934 K 6 logger V 26 dir 3u-1591.0.r241736/6976 K 5 login V 26 dir 3w-1591.0.r236892/2511 K 6 logins V 27 dir 2-126700.0.r228991/5967 K 7 logname V 28 dir 3y-1591.0.r216370/251981 K 4 look V 26 dir 40-1591.0.r227171/1053 K 6 lorder V 28 dir 42-1591.0.r216370/259435 K 5 lsvfs V 26 dir 2-2965.0.r201386/71352 K 8 lzmainfo V 27 dir u-207842.0.r226421/1189 K 2 m4 V 26 dir 44-1591.0.r244927/1330 K 4 mail V 27 dir 4a-1591.0.r239991/37347 K 4 make V 27 dir 4g-1591.0.r243831/10253 K 10 makewhatis V 25 dir a-15755.0.r237348/635 K 3 man V 27 dir 2-213317.0.r245514/1366 K 6 mandoc V 28 dir e-241754.0.r241754/19760 K 4 mesg V 28 dir 4o-1591.0.r216370/104276 K 8 minigzip V 27 dir 2-31696.0.r237410/11842 K 8 ministat V 27 dir g-118856.0.r243079/1446 K 10 mkcsmapper V 28 dir 1oh-219019.0.r243035/807 K 17 mkcsmapper_static V 32 dir 1ov-219019.0.r219019/9447722 K 5 mkdep V 28 dir 4q-1591.0.r216370/146709 K 6 mkesdb V 29 dir 1oz-219019.0.r240365/1560 K 13 mkesdb_static V 32 dir 1pd-219019.0.r219019/9455016 K 6 mkfifo V 28 dir 4s-1591.0.r216370/157492 K 8 mklocale V 26 dir 4u-1591.0.r235789/5542 K 5 mkstr V 27 dir 4w-1591.0.r216370/93245 K 6 mktemp V 25 dir 2-35193.0.r243240/505 K 7 mkulzma V 27 dir 2-229538.0.r233473/1243 K 6 mkuzip V 27 dir 4-135045.0.r221832/1036 K 4 msgs V 27 dir 50-1591.0.r241848/13580 K 2 mt V 26 dir 52-1591.0.r228619/1344 K 2 nc V 27 dir 9-141394.0.r214047/1325 K 4 ncal V 27 dir 2-31745.0.r241737/57485 K 7 ncplist V 27 dir 4-52406.0.r240506/24740 K 8 ncplogin V 27 dir 4-52702.0.r235211/18112 K 7 netstat V 26 dir 54-1591.0.r245806/1433 K 6 newgrp V 26 dir 2-97364.0.r231994/3844 K 6 newkey V 26 dir 2-26239.0.r208732/2514 K 7 nfsstat V 25 dir 56-1591.0.r243784/800 K 4 nice V 25 dir 58-1591.0.r219050/556 K 2 nl V 26 dir 4-76273.0.r226362/1040 K 5 nohup V 28 dir 5b-1591.0.r216370/166601 K 8 nslookup V 30 dir 2f-135549.0.r201386/123599 K 8 nsupdate V 29 dir 2j-135549.0.r224093/13829 K 8 opieinfo V 27 dir 2-22378.0.r201386/36735 K 7 opiekey V 28 dir 2-22380.0.r201386/119339 K 10 opiepasswd V 28 dir 2-22382.0.r201386/125929 K 8 pagesize V 28 dir 5d-1591.0.r216370/194349 K 7 pamtest V 27 dir 2w-236109.0.r236109/887 K 6 passwd V 25 dir 5f-1591.0.r243617/676 K 5 paste V 25 dir 5h-1591.0.r227242/776 K 7 pathchk V 25 dir 2-97095.0.r207485/810 K 6 perror V 26 dir 4-192398.0.r205011/501 K 2 pr V 25 dir 5l-1591.0.r243238/858 K 8 printenv V 27 dir 5n-1591.0.r216370/95378 K 6 printf V 26 dir 5p-1591.0.r244407/8401 K 8 procstat V 27 dir 2-174199.0.r245345/2225 K 5 quota V 25 dir 5r-1591.0.r227176/676 K 4 rctl V 26 dir 4-220166.0.r243856/496 K 6 renice V 27 dir 5w-1591.0.r216370/94302 K 3 rev V 28 dir 5y-1591.0.r216370/167631 K 6 revoke V 28 dir 8-194267.0.r201386/81712 K 6 rlogin V 27 dir 60-1591.0.r241737/58188 K 6 rpcgen V 26 dir 2-1897.0.r241737/60044 K 7 rpcinfo V 25 dir 2-1900.0.r239373/1076 K 2 rs V 26 dir 62-1591.0.r227177/1082 K 3 rsh V 25 dir 64-1591.0.r236892/881 K 3 rup V 27 dir 2-2344.0.r216370/171942 K 7 ruptime V 25 dir 66-1591.0.r227178/827 K 6 rusers V 24 dir 2-2346.0.r227179/619 K 5 rwall V 24 dir 2-2348.0.r227180/624 K 4 rwho V 25 dir 68-1591.0.r227181/976 K 6 script V 26 dir 6e-1591.0.r242138/3494 K 3 sed V 28 dir 6g-1591.0.r233648/109180 K 3 seq V 27 dir 4-204103.0.r243238/1477 K 10 setchannel V 27 dir 2-165023.0.r233456/2354 K 4 shar V 28 dir 6k-1591.0.r216370/270714 K 9 showmount V 25 dir 6m-1591.0.r222245/600 K 7 smbutil V 27 dir m-87874.0.r201386/55133 K 8 sockstat V 26 dir 2-45699.0.r237674/1089 K 4 sort V 27 dir 2-235267.0.r244515/1474 K 5 split V 25 dir 6t-1591.0.r229905/704 K 11 ssh-copy-id V 26 dir 4-241862.0.r242962/651 K 4 stat V 27 dir 2-97953.0.r241737/62027 K 6 stdbuf V 26 dir h-234772.0.r245419/892 K 2 su V 25 dir 6x-1591.0.r226428/496 K 6 systat V 26 dir 6z-1591.0.r240605/7641 K 4 tabs V 27 dir 2-97033.0.r140368/81115 K 4 tail V 25 dir 71-1591.0.r245184/884 K 4 talk V 27 dir 73-1591.0.r240506/26148 K 3 tar V 29 dir 2-127915.0.r238856/245671 K 5 tcopy V 25 dir 75-1591.0.r227186/913 K 3 tee V 25 dir 77-1591.0.r231524/496 K 6 telnet V 27 dir 79-1591.0.r201386/32974 K 4 tftp V 27 dir 7b-1591.0.r241737/62819 K 4 time V 25 dir 7d-1591.0.r244034/570 K 3 tip V 27 dir 7f-1591.0.r244040/64075 K 3 top V 25 dir 2-24144.0.r243262/821 K 5 touch V 26 dir 8r-1591.0.r236852/2357 K 4 tput V 28 dir 8t-1591.0.r216370/269671 K 2 tr V 25 dir 8v-1591.0.r245767/775 K 4 true V 28 dir 8x-1591.0.r216370/158528 K 8 truncate V 26 dir 4-63437.0.r204654/2554 K 5 truss V 27 dir 2-31567.0.r240562/26146 K 4 tset V 27 dir 8z-1591.0.r241737/64519 K 5 tsort V 26 dir 91-1591.0.r227189/1031 K 3 tty V 28 dir 93-1591.0.r216370/239190 K 2 ul V 25 dir 95-1591.0.r245093/491 K 5 uname V 25 dir 97-1591.0.r227191/812 K 8 unexpand V 25 dir 99-1591.0.r227192/569 K 7 unifdef V 26 dir 9b-1591.0.r233456/8407 K 4 uniq V 25 dir 9d-1591.0.r227193/941 K 5 units V 27 dir 2-16187.0.r233510/13590 K 5 unvis V 28 dir 9f-1591.0.r216370/192215 K 5 unzip V 28 dir 2-175154.0.r241331/10225 K 12 usbhidaction V 26 dir 4-113288.0.r227195/535 K 9 usbhidctl V 26 dir 4-62642.0.r236596/1271 K 5 users V 27 dir 9h-1591.0.r240506/26844 K 8 uudecode V 28 dir 9v-1591.0.r216370/228634 K 8 uuencode V 25 dir 9x-1591.0.r242136/671 K 8 vacation V 26 dir 9z-1591.0.r232263/6782 K 6 vgrind V 27 dir a1-1591.0.r233510/12731 K 2 vi V 26 dir 2-2082.0.r201386/77843 K 3 vis V 26 dir a5-1591.0.r227198/1008 K 6 vmstat V 25 dir a7-1591.0.r233298/936 K 1 w V 26 dir a9-1591.0.r245635/4367 K 4 wall V 27 dir ab-1591.0.r241848/14369 K 2 wc V 25 dir ad-1591.0.r227201/611 K 4 what V 28 dir af-1591.0.r216370/168668 K 7 whereis V 26 dir aj-1591.0.r228991/8562 K 5 which V 24 dir 2-5888.0.r227245/644 K 3 who V 27 dir al-1591.0.r241331/10909 K 5 whois V 27 dir an-1591.0.r235211/18816 K 5 write V 26 dir aq-1591.0.r231586/1843 K 5 xargs V 26 dir as-1591.0.r245050/1335 K 8 xinstall V 26 dir au-1591.0.r245793/5784 K 5 xlint V 26 dir 2-12100.0.r240257/1901 K 4 xstr V 26 dir aw-1591.0.r227247/1061 K 2 xz V 27 dir y-207842.0.r213700/1058 K 5 xzdec V 27 dir 12-207842.0.r226421/652 K 4 yacc V 27 dir ay-1591.0.r235723/70688 K 3 yes V 25 dir b2-1591.0.r240622/551 K 5 ypcat V 26 dir 4-1930.0.r201386/67936 K 7 ypmatch V 27 dir c-1930.0.r201386/119979 K 7 ypwhich V 24 dir k-1930.0.r209342/525 END ENDREP id: m-3.0.r245815/12762 type: dir pred: m-3.0.r245809/12736 count: 10539 text: 245815 1552 11197 11197 54d01b635305a46845671ffa664159d5 cpath: /head/usr.bin copyroot: 0 / minfo-cnt: 3 PLAIN K 9 COPYRIGHT V 25 file 1-2656.0.r244900/131 K 5 LOCKS V 26 file 1-146890.0.r244822/91 K 11 MAINTAINERS V 26 file 1-94742.0.r241891/132 K 8 Makefile V 30 file 3-1594.0-1595.r242522/106 K 13 Makefile.inc1 V 28 file 5-38666.0.r245803/46402 K 17 ObsoleteFiles.inc V 28 file 4-148330.0.r245513/1406 K 6 README V 26 file 1-21173.0.r215293/415 K 8 UPDATING V 26 file 1-41806.0.r245617/482 K 3 bin V 22 dir 1-5.0.r245805/5552 K 4 cddl V 27 dir 1-168404.0.r245561/2745 K 7 contrib V 26 dir 1-16755.0.r245745/5229 K 6 crypto V 26 dir 1-25405.0.r244975/7944 K 3 etc V 23 dir 1-38.0.r245752/4763 K 5 games V 25 dir 1-2491.0.r243899/3263 K 3 gnu V 23 dir 1-3.0.r245803/48203 K 7 include V 24 dir 1-697.0.r245428/5568 K 9 kerberos5 V 28 dir 4q-29815.0.r241298/10085 K 3 lib V 23 dir 6-5.0.r245750/17830 K 7 libexec V 22 dir c-5.0.r245653/3646 K 7 release V 24 dir 1-3027.0.r245742/922 K 6 rescue V 28 dir 7-117035.0.r241680/33779 K 4 sbin V 23 dir fa-4.0.r245648/9491 K 6 secure V 25 dir r-1553.0.r245527/4609 K 5 share V 22 dir e-3.0.r245813/2964 K 3 sys V 22 dir g-5.0.r245783/9745 K 5 tools V 26 dir 43-1590.0.r245804/5092 K 7 usr.bin V 23 dir m-3.0.r245815/12762 K 8 usr.sbin V 23 dir q-3.0.r245796/15871 END ENDREP id: 5-1.0.r245815/14160 type: dir pred: 5-1.0.r245813/4357 count: 172478 text: 245815 12947 1200 1200 0594b9522432563e1965ef92668f2137 props: 233713 14925 417 0 fe95f2ac252be6f08902a979c27a022c cpath: /head copyroot: 0 / minfo-cnt: 123 minfo-here: y 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.r245815/14160 K 8 projects V 23 dir 6-1.0.r245811/36317 K 7 release V 22 dir 7-1.0.r243808/2800 K 6 releng V 22 dir 8-1.0.r243710/9826 K 6 stable V 24 dir 9-1.0.r245802/149126 K 8 svnadmin V 27 dir 0-179447.0.r245687/1304 K 4 user V 23 dir a-1.0.r245814/10664 K 6 vendor V 22 dir b-1.0.r245744/5756 K 13 vendor-crypto V 26 dir 0-1575.0.r244973/13553 K 10 vendor-sys V 26 dir 0-12116.0.r245578/5113 END ENDREP id: 0.0.r245815/14941 type: dir pred: 0.0.r245814/11370 count: 245815 text: 245815 14411 517 517 1450f5ff33fb85f9fa2713f1646f2ded cpath: / copyroot: 0 / minfo-cnt: 30566 r-245803.0.t245814-59o6 modify-file true false /head/usr.bin/dtc/dtc.1 14941 15112