DELTA 178481 67142 9036 SVNO l k:k || ml1->ml_size != ml2->ml_size || !equiv_node(ml1->ml_type, ml2->ml_type, ed)) return (0);ENDREP id: 1x-178481.2f-178529.r274565/165 type: file pred: 1x-178481.2f-178529.r178546/6338 count: 4 text: 274565 0 134 31776 0370993fbcaefade0b2d98b71e16dc1c ee8119a9b06b632d95dfc5e5b7d2e88e7efd7df2 274564-5vus/_8 props: 2 314168 38 0 b6b34f029ed66be42751a530d6e4b830 cpath: /head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c copyroot: 178529 /head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c PLAIN K 7 alist.c V 36 file w-178481.22-178529.r178546/1502 K 7 alist.h V 36 file z-178481.23-178529.r178546/1899 K 9 barrier.c V 37 file 11-178481.24-178529.r178546/2296 K 9 barrier.h V 37 file 13-178481.25-178529.r178546/2700 K 9 compare.c V 36 file 15-178481.d-178482.r178482/6113 K 5 ctf.c V 35 file 17-178481.26-178529.r253678/55 K 12 ctfconvert.c V 37 file 19-178481.27-178529.r178546/3500 K 10 ctfmerge.c V 37 file 1b-178481.28-178529.r233407/1806 K 10 ctfmerge.h V 37 file 1d-178481.h-178482.r210767/88651 K 10 ctftools.h V 37 file 1f-178481.29-178529.r253661/1485 K 7 dwarf.c V 36 file 1h-178481.2a-178529.r274564/324 K 6 fifo.c V 36 file 1j-178481.k-178482.r178482/9064 K 6 fifo.h V 36 file 1l-178481.l-178482.r178482/9479 K 14 fixup_tdescs.c V 37 file 1n-178481.2b-178529.r178546/4724 K 6 hash.c V 37 file 1p-178481.2c-178529.r178546/5138 K 6 hash.h V 37 file 1r-178481.o-178482.r178482/10740 K 8 iidesc.c V 37 file 1t-178481.2d-178529.r178546/5536 K 7 input.c V 36 file 1v-178481.2e-178529.r248991/183 K 7 merge.c V 36 file 1x-178481.2f-178529.r274565/165 K 8 output.c V 36 file 1z-178481.2g-178529.r247962/110 K 10 st_parse.c V 37 file 21-178481.2h-178529.r253661/2281 K 7 stabs.c V 37 file 23-178481.2i-178529.r178546/7549 K 7 stack.c V 37 file 25-178481.v-178482.r178482/13676 K 7 stack.h V 37 file 27-178481.w-178482.r178482/14093 K 8 strtab.c V 37 file 29-178481.2j-178529.r178546/7949 K 8 strtab.h V 37 file 2b-178481.2k-178529.r178546/8351 K 7 tdata.c V 38 file 2d-178481.2l-178529.r210767/89461 K 10 traverse.c V 37 file 2f-178481.2m-178529.r249656/1155 K 10 traverse.h V 37 file 2h-178481.2n-178529.r178546/9560 K 6 util.c V 37 file 2j-178481.2o-178529.r249656/1557 END ENDREP id: b-178482.0.r274565/2257 type: dir pred: b-178482.0.r274564/2416 count: 20 text: 274565 559 1685 0 fe14ad36c3204a49d9c764bae637e683 cpath: /head/cddl/contrib/opensolaris/tools/ctf/cvt copyroot: 0 / PLAIN K 6 common V 27 dir 8-178482.0.r178546/1298 K 3 cvt V 27 dir b-178482.0.r274565/2257 K 4 dump V 26 dir d-178482.0.r178542/467 END ENDREP id: 6-178482.0.r274565/2602 type: dir pred: 6-178482.0.r274564/2761 count: 21 text: 274565 2459 130 0 931b23074abed636e5a5b1c1e40e05ca cpath: /head/cddl/contrib/opensolaris/tools/ctf copyroot: 0 / PLAIN K 3 ctf V 27 dir 6-178482.0.r274565/2602 END ENDREP id: 4-178482.0.r274565/2858 type: dir pred: 4-178482.0.r274564/3017 count: 21 text: 274565 2800 45 0 153c133cbafeaf83fc9eb90a5b12644a cpath: /head/cddl/contrib/opensolaris/tools copyroot: 0 / PLAIN K 19 OPENSOLARIS.LICENSE V 28 file 4-172301.0.r177698/9115 K 3 cmd V 28 dir 1f-168404.0.r274418/1809 K 6 common V 27 dir m-178526.0.r269229/2567 K 4 head V 28 dir 2k-168404.0.r270382/2809 K 3 lib V 29 dir 2y-168404.0.r274337/61766 K 5 tools V 27 dir 4-178482.0.r274565/2858 END ENDREP id: 1d-168404.0.r274565/3342 type: dir pred: 1d-168404.0.r274564/3501 count: 479 text: 274565 3051 278 0 0899dd86883a794831aaf1ae20afc5b1 props: 274337 62268 1179 0 370279adb2eebd21662190df09b6b878 cpath: /head/cddl/contrib/opensolaris copyroot: 0 / minfo-cnt: 4 minfo-here: y PLAIN K 13 dtracetoolkit V 34 dir 2-211557.0-235380.r269360/3483 K 11 opensolaris V 28 dir 1d-168404.0.r274565/3342 END ENDREP id: 1c-168404.0.r274565/3747 type: dir pred: 1c-168404.0.r274564/3906 count: 497 text: 274565 3620 114 0 2afdb191e3520254917de50ed3c486f6 cpath: /head/cddl/contrib copyroot: 0 / minfo-cnt: 4 PLAIN K 8 Makefile V 29 file 3-168404.0.r265420/40275 K 12 Makefile.inc V 27 file 6-168404.0.r270358/521 K 6 compat V 27 dir 8-168404.0.r265689/8582 K 7 contrib V 28 dir 1c-168404.0.r274565/3747 K 3 lib V 28 dir 54-168404.0.r273370/1905 K 4 sbin V 29 dir 5y-168404.0.r268075/78211 K 5 tests V 27 dir g-264741.0.r264741/8446 K 7 usr.bin V 29 dir 6c-168404.0.r268075/79494 K 8 usr.sbin V 27 dir 6m-168404.0.r272034/840 END ENDREP id: 1-168404.0.r274565/4367 type: dir pred: 1-168404.0.r274564/4526 count: 589 text: 274565 3939 415 0 0746dc481a33112141fbc0d16da06ee3 props: 262613 4020 318 0 02b4cbb3eee9b4d0973ffcfcc6054cc3 cpath: /head/cddl copyroot: 0 / minfo-cnt: 5 minfo-here: y PLAIN K 10 .arcconfig V 26 file 1-265842.0.r269985/48 K 8 .arclint V 27 file 1-266959.0.r266959/151 K 9 COPYRIGHT V 25 file 1-2656.0.r260125/103 K 5 LOCKS V 27 file 1-146890.0.r255635/270 K 11 MAINTAINERS V 25 file 1-94742.0.r274384/47 K 8 Makefile V 28 file 3-1594.0-1595.r271168/0 K 13 Makefile.inc1 V 26 file 5-38666.0.r274490/345 K 17 ObsoleteFiles.inc V 29 file 4-148330.0.r274331/16062 K 6 README V 26 file 1-21173.0.r215293/143 K 8 UPDATING V 28 file 1-41806.0.r274331/16357 K 3 bin V 22 dir 1-5.0.r274515/5659 K 4 cddl V 27 dir 1-168404.0.r274565/4367 K 7 contrib V 26 dir 1-16755.0.r274559/8033 K 6 crypto V 28 dir 1-25405.0.r273144/138151 K 3 etc V 24 dir 1-38.0.r274331/31599 K 5 games V 25 dir 1-2491.0.r272210/1395 K 3 gnu V 22 dir 1-3.0.r274391/3485 K 7 include V 24 dir 1-697.0.r273613/5354 K 9 kerberos5 V 27 dir 4q-29815.0.r271775/2495 K 3 lib V 23 dir 6-5.0.r274462/22516 K 7 libexec V 23 dir c-5.0.r274364/17792 K 7 release V 26 dir 1-3027.0.r274331/47170 K 6 rescue V 26 dir 7-117035.0.r274217/785 K 4 sbin V 23 dir fa-4.0.r274527/5441 K 6 secure V 25 dir r-1553.0.r273146/7157 K 5 share V 23 dir e-3.0.r274532/31214 K 3 sys V 23 dir g-5.0.r274560/29204 K 5 tests V 27 dir g-257097.0.r274267/1297 K 5 tools V 27 dir 43-1590.0.r274363/60829 K 7 usr.bin V 23 dir m-3.0.r274552/12861 K 8 usr.sbin V 23 dir q-3.0.r274551/11381 END ENDREP id: 5-1.0.r274565/5975 type: dir pred: 5-1.0.r274564/6134 count: 187707 text: 274565 4621 1341 0 2ef7db6c9f8010847056ad0019b1ffe5 props: 272840 54634 811 0 c3fd00255d37d1bfe91f535b741da94a cpath: /head copyroot: 0 / minfo-cnt: 166 minfo-here: y PLAIN K 11 ROADMAP.txt V 26 file 0-179453.0.r221478/53 K 4 head V 22 dir 5-1.0.r274565/5975 K 8 projects V 23 dir 6-1.0.r274554/17991 K 7 release V 22 dir 7-1.0.r274417/3010 K 6 releng V 22 dir 8-1.0.r274401/9812 K 6 stable V 23 dir 9-1.0.r274563/37754 K 8 svnadmin V 27 dir 0-179447.0.r274419/2225 K 4 user V 24 dir a-1.0.r274550/310045 K 6 vendor V 23 dir b-1.0.r274558/11397 K 13 vendor-crypto V 25 dir 0-1575.0.r273141/3425 K 10 vendor-sys V 26 dir 0-12116.0.r274358/5990 END ENDREP id: 0.0.r274565/6708 type: dir pred: 0.0.r274564/6868 count: 274565 text: 274565 6221 474 0 ae1c2528d1ec7fb925df592a56262b76 props: 268296 0 4065 0 355af92b91f7afa3e8c1f0f3befeb918 cpath: / copyroot: 0 / minfo-cnt: 41593 1x-178481.2f-178529.t274564-5vus modify-file true false /head/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c 6708 6930