DELTA 331707 532 38 SVN‚àa‚ßG5 4Š §pŠ!…uČ(‚1ž4‚qș}ƒ>Ÿ€ËÂqˆb‚Ž$•Đ_‚return (-1); } ce->ce_txg = txg; ce->ce_config = fnvlist_dup(config); ce->ce_next = ve->ve_configs; ve->ve_configs = cematched) nvlist_free(config);ENDREP id: 4g-168404.0.r337185/254 type: file pred: 4g-168404.0.r331707/8450 count: 30 text: 337185 0 227 44999 9548bef8788e8d555bba404f70360119 e63db3090204d993900e621ac201b2d4c3e3dc0d 337184-78hu/_8 props: 2 314168 38 0 b6b34f029ed66be42751a530d6e4b830 cpath: /head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c copyroot: 0 / PLAIN K 8 libzfs.h V 29 file 43-168404.0.r337063/3915 K 19 libzfs_changelist.c V 29 file 46-168404.0.r337063/4247 K 15 libzfs_compat.c V 34 file 8-248461.0-248571.r321921/101 K 15 libzfs_compat.h V 35 file 8-247882.1-248571.r248571/6967 K 15 libzfs_config.c V 29 file 48-168404.0.r305205/4489 K 16 libzfs_dataset.c V 29 file 4a-168404.0.r337183/8415 K 13 libzfs_diff.c V 29 file 26-219089.0.r337017/5433 K 12 libzfs_fru.c V 26 file 28-219089.0.r316695/0 K 13 libzfs_impl.h V 29 file 4e-168404.0.r337063/4590 K 15 libzfs_import.c V 28 file 4g-168404.0.r337185/254 K 13 libzfs_iter.c V 27 file l-228103.0.r329808/810 K 14 libzfs_mount.c V 29 file 4i-168404.0.r337063/4924 K 13 libzfs_pool.c V 30 file 4k-168404.0.r337007/26684 K 17 libzfs_sendrecv.c V 28 file 1x-185029.0.r333307/125 K 15 libzfs_status.c V 30 file 4m-168404.0.r334844/52032 K 13 libzfs_util.c V 30 file 4o-168404.0.r337007/27025 END ENDREP id: 41-168404.0.r337185/1494 type: dir pred: 41-168404.0.r337183/9662 count: 201 text: 337185 589 892 0 5fe14952b18479772917b12885835c3f cpath: /head/cddl/contrib/opensolaris/lib/libzfs/common copyroot: 0 / PLAIN K 6 common V 28 dir 41-168404.0.r337185/1494 END ENDREP id: 40-168404.0.r337185/1764 type: dir pred: 40-168404.0.r337183/9933 count: 216 text: 337185 1702 49 0 2cb3fc5f0bf50eb449d101a1e2187d83 props: 337017 6947 2301 0 113630571237041c9926bcc72fe8c88d cpath: /head/cddl/contrib/opensolaris/lib/libzfs copyroot: 0 / minfo-cnt: 1 minfo-here: y PLAIN K 11 libcmdutils V 34 dir 9-325013.0-325035.r325035/9091 K 6 libctf V 26 dir 5-178480.0.r331594/944 K 9 libdtrace V 27 dir a-178480.0.r331222/5026 K 6 libgen V 28 dir e-178480.0.r277300/50801 K 9 libnvpair V 27 dir 2z-168404.0.r305211/804 K 8 libuutil V 28 dir 38-168404.0.r262912/1395 K 6 libzfs V 28 dir 40-168404.0.r337185/1764 K 11 libzfs_core V 35 dir q-238592.2-248571.r337007/32463 K 8 libzpool V 29 dir 4q-168404.0.r334844/55329 K 5 pyzfs V 29 dir 19-209962.0.r260183/27266 END ENDREP id: 2y-168404.0.r337185/2550 type: dir pred: 2y-168404.0.r337183/10719 count: 442 text: 337185 2051 486 0 37eae2edce92d71bf105c0b2e6dcf11b cpath: /head/cddl/contrib/opensolaris/lib copyroot: 0 / minfo-cnt: 1 PLAIN K 19 OPENSOLARIS.LICENSE V 28 file 4-172301.0.r177698/9115 K 3 cmd V 28 dir 1f-168404.0.r337183/8206 K 6 common V 27 dir m-178526.0.r331595/1495 K 4 head V 28 dir 2k-168404.0.r270382/2809 K 3 lib V 28 dir 2y-168404.0.r337185/2550 K 5 tools V 27 dir 4-178482.0.r334961/5471 END ENDREP PLAIN K 13 svn:mergeinfo V 3001 /head/cddl/contrib/opensolaris:2-168403 /projects/bsd_rdma_4_9/cddl/contrib/opensolaris:319973-326168 /projects/clang-sparc64/cddl/contrib/opensolaris:262258-262612 /projects/clang-trunk/cddl/contrib/opensolaris:283596-287505 /projects/clang350-import/cddl/contrib/opensolaris:274961-276476 /projects/clang360-import/cddl/contrib/opensolaris:277327-280030 /projects/clang370-import/cddl/contrib/opensolaris:287506-288928 /projects/clang380-import/cddl/contrib/opensolaris:292913-296412 /projects/clang390-import/cddl/contrib/opensolaris:303250-309123 /projects/clang391-import/cddl/contrib/opensolaris:309166-310192 /projects/clang400-import/cddl/contrib/opensolaris:311132-314524 /projects/clang500-import/cddl/contrib/opensolaris:316992-321352 /projects/clang600-import/cddl/contrib/opensolaris:326936-327933 /projects/collation/cddl/contrib/opensolaris:286424-290491 /projects/largeSMP/cddl/contrib/opensolaris:221273-222812,222815-223757 /projects/libzfs_core/cddl/contrib/opensolaris:247831-248551 /projects/mpsutil/cddl/contrib/opensolaris:286179-290100 /projects/multi-fibv6/head/cddl/contrib/opensolaris:230929-231848 /projects/quota64/cddl/contrib/opensolaris:184125-207707 /vendor/illumos/dist:238592,238725,239610,239746,240110,240262,240326,240357,240949,242729,242732-242733,243012-243013,243395,244245,246388,246392,247176,247180,247580,247844-247845,248217,248266,249185,249332,251619,251623-251624,251644,252213,252215,253781,253784,254070-254071,254079,254421-254422,254746,254748,254750-254751,255255,258371-258374,258384,258972,259170,260152,260154,260710,262570,263436-263438,263886-263887,264666,264829,266766,266986-266989,266992,267565-267566,267568,267570,267931,268119,268121,268453-268455,268714,268848,269010,269223,269426,270197,271225,271511,271516,272493,272585,272588,272802,272851,274271-274273,275532,275536-275537,275547,275551,275783-275784,277425-277430,277432,279822,284030,284035,284042,286224,286538,286540,286542,286544,286546,286548,286550,286553,286555,286586,286588,286597,286599,286602,286604,286704,286707,288408,289003,289310-289312,289493,289498,289526,289530,289535,289561,289689,294816,295046,296505,296518,296527,296532,296534,296536,296538,296540,296989,297505,297760,298471,302642-302643,302653-302660,302662,302991,303079-303081,304056-304057,304159,308222,308986,308989,315290,316693,316858,316860-316864,316872-316873,316875-316877,316891,316893-316894,316901-316902,316904,316908,316918,316922,316926,316931-316934,318941,318946,319740,319743-319745,319945,322217,322223,322229,322231,322235,323105,323107,323523,323527,323530,323535,323790,323794,323911-323913,324198,325013,325034,328220,328231,328233,328249,328251,328255,329502,329718,329753,329766,329781,329793,329807,331407,331695,331706,331712,336944,336946,336950,336955,336991,337014,337016,337161,337178,337182,337184 /vendor/opensolaris/dist:194442-210759 /vendor/resolver/dist/cddl/contrib/opensolaris:1540-186085 /vendor-cddl/opensolaris/dist/cddl/contrib/opensolaris:178477-194441 END ENDREP id: 1d-168404.0.r337185/6094 type: dir pred: 1d-168404.0.r337183/14258 count: 847 text: 337185 2759 277 0 6a2a37c65ef57e98724256bffd06a0b2 props: 337185 3049 3032 0 de376e8fa2cd5f1b7aa14065e83ec91a cpath: /head/cddl/contrib/opensolaris copyroot: 0 / minfo-cnt: 5 minfo-here: y PLAIN K 11 opensolaris V 28 dir 1d-168404.0.r337185/6094 END ENDREP id: 1c-168404.0.r337185/6440 type: dir pred: 1c-168404.0.r337183/14608 count: 867 text: 337185 6372 55 0 546c8e6f9b1f7feb55debce701e109bd cpath: /head/cddl/contrib copyroot: 0 / minfo-cnt: 5 PLAIN K 8 Makefile V 29 file 3-168404.0.r321912/27183 K 12 Makefile.inc V 27 file 6-168404.0.r270358/521 K 6 compat V 27 dir 8-168404.0.r323193/1533 K 7 contrib V 28 dir 1c-168404.0.r337185/6440 K 3 lib V 29 dir 54-168404.0.r337160/12048 K 4 sbin V 29 dir 5y-168404.0.r337160/13699 K 5 tests V 28 dir g-264741.0.r299094/54139 K 7 usr.bin V 29 dir 6c-168404.0.r337160/16249 K 8 usr.sbin V 29 dir 6m-168404.0.r337160/19785 END ENDREP id: 1-168404.0.r337185/7064 type: dir pred: 1-168404.0.r337183/15235 count: 1100 text: 337185 6632 419 0 65c7904f612d43da5c8cecb36074e0f1 props: 327952 19231 882 0 aeb1e7663b2a5e0d40b6507f784e52ae cpath: /head/cddl copyroot: 0 / minfo-cnt: 6 minfo-here: y PLAIN K 10 .arcconfig V 26 file 1-265842.0.r306435/41 K 8 .arclint V 25 file 1-266959.0.r326959/0 K 14 .gitattributes V 25 file 1-327183.0.r337158/0 K 10 .gitignore V 26 file 4-327183.0.r335840/66 K 9 COPYRIGHT V 25 file 1-2656.0.r333391/421 K 5 LOCKS V 26 file 1-146890.0.r334871/53 K 11 MAINTAINERS V 26 file 1-94742.0.r336347/113 K 8 Makefile V 30 file 3-1594.0-1595.r336434/134 K 13 Makefile.inc1 V 26 file 5-38666.0.r336608/219 K 18 Makefile.libcompat V 33 file 5-38666.0-296709.r336908/156 K 16 Makefile.sys.inc V 27 file 3-325973.0.r326580/260 K 17 ObsoleteFiles.inc V 28 file 4-148330.0.r336717/1104 K 6 README V 26 file 1-21173.0.r335299/328 K 9 README.md V 27 file 1-314473.0.r335299/605 K 8 UPDATING V 27 file 1-41806.0.r337033/1029 K 3 bin V 22 dir 1-5.0.r336483/5793 K 4 cddl V 27 dir 1-168404.0.r337185/7064 K 7 contrib V 27 dir 1-16755.0.r337045/13028 K 6 crypto V 26 dir 1-25405.0.r333678/1630 K 3 etc V 23 dir 1-38.0.r336978/4169 K 3 gnu V 22 dir 1-3.0.r336351/2122 K 7 include V 25 dir 1-697.0.r336299/22257 K 9 kerberos5 V 27 dir 4q-29815.0.r336151/2004 K 3 lib V 23 dir 6-5.0.r337160/28456 K 7 libexec V 22 dir c-5.0.r337128/4363 K 7 release V 25 dir 1-3027.0.r337159/1400 K 6 rescue V 26 dir 7-117035.0.r325633/917 K 4 sbin V 24 dir fa-4.0.r336914/33298 K 6 secure V 27 dir r-1553.0.r333490/175440 K 5 share V 22 dir e-3.0.r337130/6122 K 5 stand V 34 dir 6j-38465.0-325834.r337131/3859 K 3 sys V 23 dir g-5.0.r337183/34476 K 7 targets V 35 dir 2-242818.1-284345.r336437/18573 K 5 tests V 27 dir g-257097.0.r337059/3699 K 5 tools V 26 dir 43-1590.0.r337157/9055 K 7 usr.bin V 23 dir m-3.0.r337133/15341 K 8 usr.sbin V 23 dir q-3.0.r337160/40888 END ENDREP id: 5-1.0.r337185/8997 type: dir pred: 5-1.0.r337183/36390 count: 224867 text: 337185 7321 1663 0 754c16d38499e4085d2b4f0b6a08b482 props: 335839 0 3072 0 de1e5a2a5bd8da764c9e6fe6a93893b0 cpath: /head copyroot: 0 / minfo-cnt: 123 minfo-here: y PLAIN K 11 ROADMAP.txt V 26 file 0-179453.0.r285589/70 K 4 head V 22 dir 5-1.0.r337185/8997 K 8 projects V 23 dir 6-1.0.r337176/24479 K 7 release V 22 dir 7-1.0.r335563/3312 K 6 releng V 23 dir 8-1.0.r335510/19358 K 6 stable V 23 dir 9-1.0.r337132/69381 K 8 svnadmin V 27 dir 0-179447.0.r336808/1321 K 4 user V 23 dir a-1.0.r336705/38765 K 6 vendor V 22 dir b-1.0.r337184/9317 K 13 vendor-crypto V 25 dir 0-1575.0.r335075/4884 K 10 vendor-sys V 27 dir 0-12116.0.r337182/26750 END ENDREP id: 0.0.r337185/9728 type: dir pred: 0.0.r337184/10033 count: 337185 text: 337185 9241 474 0 003d393c18860ac43ea8864cc17dc126 props: 289270 0 4229 0 20f578acc837c5e58fc64b9eaa493aea cpath: / copyroot: 0 / minfo-cnt: 45242 1d-168404.0.t337184-78hu modify-dir false true /head/cddl/contrib/opensolaris 4g-168404.0.t337184-78hu modify-file true false /head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c 9728 9951