DELTA 348005 0 92 SVNŸžv‡Y„‡ZıN‹p€}Ĝ;ĈV8 return (-1); } /* Don't print if in the delete queue on from side */ if (di->zerr == ESTALE) { di->zerr = 0; return (0ENDREP id: 26-219089.0.r348581/191 type: file pred: 26-219089.0.r348005/1421 count: 10 text: 348581 0 166 20342 133c8e7d98c6cbab06347c4573dbc81c be15501bd23e4f9feee395d59b49ac0577009b39 348580-7hae/_8 props: 181638 20946 99 0 abb69987c251c67af4131d6a711a4ae8 cpath: /head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c copyroot: 0 / PLAIN K 8 libzfs.h V 29 file 43-168404.0.r344601/3558 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 28 file 4a-168404.0.r348557/427 K 13 libzfs_diff.c V 28 file 26-219089.0.r348581/191 K 12 libzfs_fru.c V 26 file 28-219089.0.r316695/0 K 13 libzfs_impl.h V 29 file 4e-168404.0.r344569/9101 K 15 libzfs_import.c V 28 file 4g-168404.0.r337185/254 K 13 libzfs_iter.c V 28 file l-228103.0.r337567/5553 K 14 libzfs_mount.c V 28 file 4i-168404.0.r344618/123 K 13 libzfs_pool.c V 30 file 4k-168404.0.r337007/26684 K 17 libzfs_sendrecv.c V 29 file 1x-185029.0.r344601/3889 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.r348581/1432 type: dir pred: 41-168404.0.r348557/1669 count: 210 text: 348581 528 891 0 5c84d2bb7b6e16738cb718c6ac9a311e cpath: /head/cddl/contrib/opensolaris/lib/libzfs/common copyroot: 0 / PLAIN K 6 common V 28 dir 41-168404.0.r348581/1432 END ENDREP PLAIN K 13 svn:mergeinfo V 2450 /head/cddl/contrib/opensolaris/lib/libzfs:2-168403 /projects/bsd_rdma_4_9/cddl/contrib/opensolaris/lib/libzfs:319973-326168 /projects/clang-sparc64/cddl/contrib/opensolaris/lib/libzfs:262258-262612 /projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs:283596-287505 /projects/clang350-import/cddl/contrib/opensolaris/lib/libzfs:274961-276476 /projects/clang360-import/cddl/contrib/opensolaris/lib/libzfs:277327-280030 /projects/clang370-import/cddl/contrib/opensolaris/lib/libzfs:287506-288928 /projects/clang380-import/cddl/contrib/opensolaris/lib/libzfs:292913-296412 /projects/clang390-import/cddl/contrib/opensolaris/lib/libzfs:303250-309123 /projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs:316992-321352 /projects/clang700-import/cddl/contrib/opensolaris/lib/libzfs:336870-341824 /projects/clang800-import/cddl/contrib/opensolaris/lib/libzfs:343202-344778 /projects/collation/cddl/contrib/opensolaris/lib/libzfs:286424-290491 /projects/largeSMP/cddl/contrib/opensolaris/lib/libzfs:221273-222812,222815-223757 /projects/libzfs_core/cddl/contrib/opensolaris/lib/libzfs:247831-248551 /projects/mpsutil/cddl/contrib/opensolaris/lib/libzfs:286179-290100 /projects/multi-fibv6/head/cddl/contrib/opensolaris/lib/libzfs:230929-231848 /projects/quota64/cddl/contrib/opensolaris/lib/libzfs:184125-207707 /vendor/illumos/dist/lib/libzfs:238417,238592,238725,239610,239746,240326,246388,247180,247580,251619,251623,251644,252213,252215,253781,253784,254421,254748,254750,255255,258371-258372,258374,258384,260154,262570,263436-263438,263887,264829,266988,267565-267566,268119,268453,269010,271511,272493,274273,275537,275784,277425-277428,277430,277432,284042,286538,286540,286542,286544,286546,286548,286550,286553,286555,286586,286588,286597,286599,286602,286604,286704,289310-289312,289493,289498,289526,289530,289561,294816,295046,296518,296527,296538,296540,297760,298471,302642-302643,302653-302655,302657-302660,308989,316693,316873,316875-316877,316891,316893-316894,316901-316902,316908,316918,316922,316931-316934,318941,318946,319740,319945,322217,322229,322231,323107,323523,323530,323790,323911,325013,328220,328231,328233,328249,328251,329502,329718,329781,329793,329807,331695,331706,336991,337014,337214,342469,348534,348580 /vendor/opensolaris/dist/lib/libzfs:194442-210759 /vendor/resolver/dist/cddl/contrib/opensolaris/lib/libzfs:1540-186085 /vendor-cddl/opensolaris/dist/cddl/contrib/opensolaris/lib/libzfs:178477-194441 END ENDREP id: 40-168404.0.r348581/4196 type: dir pred: 40-168404.0.r348557/4426 count: 227 text: 348581 1640 49 0 8c62ac562d785a983ea524466b5ac096 props: 348581 1702 2481 0 b458c62054086d9c7f6b94c6ab11af20 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.r344366/4916 K 6 libgen V 28 dir e-178480.0.r277300/50801 K 9 libnvpair V 28 dir 2z-168404.0.r337227/6236 K 8 libuutil V 28 dir 38-168404.0.r262912/1395 K 6 libzfs V 28 dir 40-168404.0.r348581/4196 K 11 libzfs_core V 34 dir q-238592.2-248571.r342525/8323 K 8 libzpool V 28 dir 4q-168404.0.r344359/1089 K 5 pyzfs V 29 dir 19-209962.0.r260183/27266 END ENDREP id: 2y-168404.0.r348581/4981 type: dir pred: 2y-168404.0.r348557/5211 count: 457 text: 348581 4483 485 0 ee85ec09ecf08bb5cb05fd37958d0265 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.r348579/6733 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.r348581/4981 K 5 tools V 27 dir 4-178482.0.r344534/2751 END ENDREP PLAIN K 13 svn:mergeinfo V 3208 /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/clang700-import/cddl/contrib/opensolaris:336870-341824 /projects/clang800-import/cddl/contrib/opensolaris:343202-344778 /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,337214,337223,342469,342532,344364,348534,348552-348553,348568,348578,348580 /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.r348581/8731 type: dir pred: 1d-168404.0.r348579/10476 count: 881 text: 348581 5189 277 0 912578dd9eaebda70c8e56c23356173b props: 348581 5479 3239 0 eea8478fcde3ec0322b81f1c41665b01 cpath: /head/cddl/contrib/opensolaris copyroot: 0 / minfo-cnt: 5 minfo-here: y PLAIN K 11 opensolaris V 28 dir 1d-168404.0.r348581/8731 END ENDREP id: 1c-168404.0.r348581/9077 type: dir pred: 1c-168404.0.r348579/10823 count: 901 text: 348581 9009 55 0 1bd26b0456049bdba2db88ebea059181 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.r348581/9077 K 3 lib V 28 dir 54-168404.0.r343111/4408 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 28 dir 6c-168404.0.r338128/3937 K 8 usr.sbin V 28 dir 6m-168404.0.r348081/6309 END ENDREP id: 1-168404.0.r348581/9698 type: dir pred: 1-168404.0.r348579/11446 count: 1150 text: 348581 9269 416 0 cfcf0f72a85aae7587fde85051c8e004 props: 344779 12428 1007 0 2475c334a803ee14ea87a0ab28654cb3 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 11 .cirrus.yml V 26 file 1-346085.0.r346121/66 K 14 .gitattributes V 27 file 1-327183.0.r342793/891 K 10 .gitignore V 26 file 4-327183.0.r335840/66 K 9 COPYRIGHT V 24 file 1-2656.0.r342661/98 K 5 LOCKS V 26 file 1-146890.0.r334871/53 K 11 MAINTAINERS V 26 file 1-94742.0.r346904/489 K 8 Makefile V 30 file 3-1594.0-1595.r348241/142 K 13 Makefile.inc1 V 24 file 5-38666.0.r348540/0 K 18 Makefile.libcompat V 33 file 5-38666.0-296709.r340371/111 K 16 Makefile.sys.inc V 27 file 3-325973.0.r326580/260 K 17 ObsoleteFiles.inc V 29 file 4-148330.0.r348225/69564 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 26 file 1-41806.0.r348185/116 K 3 bin V 22 dir 1-5.0.r348177/2655 K 4 cddl V 27 dir 1-168404.0.r348581/9698 K 7 contrib V 26 dir 1-16755.0.r348527/6377 K 6 crypto V 26 dir 1-25405.0.r348419/6087 K 3 etc V 23 dir 1-38.0.r348532/1194 K 3 gnu V 22 dir 1-3.0.r347992/2437 K 7 include V 24 dir 1-697.0.r348178/5602 K 9 kerberos5 V 27 dir 4q-29815.0.r344179/4588 K 3 lib V 23 dir 6-5.0.r348545/10234 K 7 libexec V 22 dir c-5.0.r348270/5140 K 7 release V 25 dir 1-3027.0.r348474/2491 K 6 rescue V 26 dir 7-117035.0.r340652/845 K 4 sbin V 23 dir fa-4.0.r348510/5742 K 6 secure V 27 dir r-1553.0.r348340/457941 K 5 share V 23 dir e-3.0.r348542/33323 K 5 stand V 34 dir 6j-38465.0-325834.r348569/7551 K 3 sys V 23 dir g-5.0.r348579/34761 K 7 targets V 35 dir 2-242818.1-284345.r348225/76797 K 5 tests V 27 dir g-257097.0.r348454/7287 K 5 tools V 27 dir 43-1590.0.r348504/10911 K 7 usr.bin V 23 dir m-3.0.r348521/42506 K 8 usr.sbin V 23 dir q-3.0.r348547/12497 END ENDREP id: 5-1.0.r348581/11679 type: dir pred: 5-1.0.r348579/36722 count: 231056 text: 348581 9956 1710 0 ec22b63451e4ca3884550959f4d4c467 props: 345677 27131 3372 0 c03f29ed5d7df4a11381ec213f7d6b20 cpath: /head copyroot: 0 / minfo-cnt: 127 minfo-here: y PLAIN K 11 ROADMAP.txt V 26 file 0-179453.0.r285589/70 K 4 head V 23 dir 5-1.0.r348581/11679 K 8 projects V 23 dir 6-1.0.r348560/26288 K 7 release V 22 dir 7-1.0.r341707/3356 K 6 releng V 23 dir 8-1.0.r347633/13504 K 6 stable V 23 dir 9-1.0.r348549/40358 K 8 svnadmin V 27 dir 0-179447.0.r348528/1304 K 4 user V 23 dir a-1.0.r348475/14175 K 6 vendor V 22 dir b-1.0.r348580/9545 K 13 vendor-crypto V 25 dir 0-1575.0.r348339/7108 K 10 vendor-sys V 27 dir 0-12116.0.r348578/30902 END ENDREP id: 0.0.r348581/12416 type: dir pred: 0.0.r348580/10261 count: 348581 text: 348581 11928 475 0 526888422e345f89f21dd9ce345a7ea8 props: 289270 0 4229 0 20f578acc837c5e58fc64b9eaa493aea cpath: / copyroot: 0 / minfo-cnt: 45908 1d-168404.0.t348580-7hae modify-dir false true /head/cddl/contrib/opensolaris 40-168404.0.t348580-7hae modify-dir false true /head/cddl/contrib/opensolaris/lib/libzfs 26-219089.0.t348580-7hae modify-file true false /head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c 12416 12641