DELTA 243984 0 1866 SVNPP ) YO(e29719690762be6add7d550cab9180766746f4e0ENDREP DELTA 243982 22731 7916 SVNJbljZpj NOTE(uqs): HACK ALERT! Only merge between head, projects, and user // branches for the FreeBSD repositories. Never merge into stable or // releng, as we only ever cherry-pick changes to those branches. // FIXME: Needs to move into the ruleset ... if (path_from != NULL && prevrepository == repository && prevbranch != branch && (branch.startsWith("master") || branch.startsWith("head") || branch.startsWith("projects") || branch.startsWith("user"))ENDREP id: 5-243984.0.r243985/642 type: file pred: 5-243984.0.r243984/1995 count: 1 text: 243985 0 63 8656 c4b53b32869b3e0e5b91ef44fa230731 c3424619e8a37db14ac158317aa3e991ed804987 243984-589c/_6 props: 243984 1879 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /user/uqs/git_conv/svn2git/src/Makefile copyroot: 0 / id: q-243982.0.r243985/951 type: file pred: q-243982.0.r243982/34837 count: 1 text: 243985 90 521 33122 bad82632578ee0713d475f8b26b015bb ff8f51fdd79e03913ce3dc3d46bf78af40708fe6 243984-589c/_7 props: 243982 34721 103 0 bb58aa814bbdf5f7c1ab04a05656f5a5 cpath: /user/uqs/git_conv/svn2git/src/svn.cpp copyroot: 0 / PLAIN K 21 CommandLineParser.cpp V 29 file 9-243982.0.r243982/31740 K 19 CommandLineParser.h V 29 file c-243982.0.r243982/32156 K 8 Makefile V 27 file 5-243984.0.r243985/642 K 8 main.cpp V 29 file e-243982.0.r243982/32570 K 14 repository.cpp V 29 file g-243982.0.r243982/32973 K 12 repository.h V 29 file i-243982.0.r243982/33383 K 14 ruleparser.cpp V 29 file k-243982.0.r243982/33791 K 12 ruleparser.h V 29 file m-243982.0.r243982/34202 K 7 src.pro V 29 file o-243982.0.r243982/34494 K 7 svn.cpp V 27 file q-243982.0.r243985/951 K 5 svn.h V 29 file s-243982.0.r243982/35241 END ENDREP id: 8-243982.0.r243985/1850 type: dir pred: 8-243982.0.r243984/2866 count: 2 text: 243985 1264 573 573 0bbb70773eda1553fd2753fa5b1cb60e cpath: /user/uqs/git_conv/svn2git/src copyroot: 0 / PLAIN K 16 fast-export2.pro V 29 file 5-243982.0.r243982/31397 K 3 src V 27 dir 8-243982.0.r243985/1850 END ENDREP id: 3-243982.0.r243985/2154 type: dir pred: 3-243982.0.r243984/3171 count: 2 text: 243985 2039 102 102 8de0c157481c44bbac8a9d38e56349f1 cpath: /user/uqs/git_conv/svn2git copyroot: 0 / PLAIN K 17 freebsd-doc.rules V 28 file 5-241674.0.r241674/2660 K 19 freebsd-ports.rules V 28 file 8-241674.0.r241674/2879 K 13 freebsd.rules V 28 file a-241674.0.r241674/3102 K 8 git_conv V 28 file c-241674.0.r241674/3363 K 13 git_conv_cron V 28 file e-241674.0.r241674/3678 K 7 svn2git V 27 dir 3-243982.0.r243985/2154 END ENDREP id: 3-241674.0.r243985/2670 type: dir pred: 3-241674.0.r243984/3688 count: 3 text: 243985 2339 318 318 8000001d569f7686f3ae35cbd4b0dd00 cpath: /user/uqs/git_conv copyroot: 0 / PLAIN K 8 git_conv V 27 dir 3-241674.0.r243985/2670 END ENDREP id: 1-241674.0.r243985/2910 type: dir pred: 1-241674.0.r243984/3929 count: 3 text: 243985 2847 50 50 285e0358d2cbcc38dc50420ea28d03d5 cpath: /user/uqs copyroot: 0 / PLAIN K 14 GUIDELINES.txt V 28 file 1-183719.0.r235275/4948 K 6 adrian V 27 dir 1-185062.0.r239660/1753 K 2 ae V 29 dir 1-208944.0.r239122/646039 K 3 alc V 26 dir 1-187698.0.r237686/205 K 6 alfred V 28 dir 1-242436.0.r242812/16652 K 5 andre V 29 dir 1-232338.0.r243620/302581 K 7 attilio V 30 dir 1-225231.0.r241915/1656248 K 3 avg V 28 dir 1-221670.0.r222061/16659 K 6 brooks V 30 dir 1-221798.0.r238996/6792285 K 5 crees V 27 dir 1-241560.0.r242994/1044 K 7 davidxu V 28 dir 1-214656.0.r233443/10269 K 7 delphij V 27 dir 1-204897.0.r228506/1373 K 3 des V 27 dir 1-194080.0.r241722/2816 K 3 dfr V 28 dir 1-184622.0.r190546/15651 K 5 dougb V 27 dir 1-198220.0.r241090/1341 K 2 ed V 28 dir 1-193319.0.r243802/32139 K 5 edwin V 27 dir 1-183766.0.r211835/4779 K 3 eri V 30 dir 1-197864.0.r204245/1236407 K 7 fabient V 28 dir 1-197268.0.r197319/29080 K 5 gabor V 28 dir 1-221404.0.r241808/15845 K 3 gad V 26 dir 1-192136.0.r193132/800 K 5 gavin V 24 dir 1-241771.0.r241771/0 K 3 gnn V 26 dir 1-194403.0.r241557/380 K 3 hrs V 26 dir 1-204715.0.r239365/417 K 3 imp V 28 dir 1-184493.0.r234548/74775 K 5 jceel V 27 dir 1-235295.0.r239461/9102 K 8 jchandra V 28 dir 1-215108.0.r233508/11016 K 3 jgh V 25 dir 1-233591.0.r233616/17 K 9 jimharris V 26 dir 1-228374.0.r231711/383 K 8 jmallett V 25 dir 1-204380.0.r232796/17 K 8 keramida V 28 dir 1-185204.0.r185209/12418 K 3 kib V 27 dir 1-204124.0.r207315/7991 K 5 kmacy V 28 dir 1-183756.0.r208125/15101 K 8 lstewart V 26 dir 1-184064.0.r207267/223 K 5 luigi V 28 dir 1-186852.0.r230582/16513 K 4 lulf V 24 dir 1-184032.0.r184032/0 K 6 marcel V 28 dir 1-234079.0.r234102/15107 K 6 mjacob V 29 dir 1-227632.0.r240511/317219 K 6 mlaier V 29 dir 1-185890.0.r186173/497434 K 2 mr V 29 dir 1-218553.0.r219466/277889 K 8 netchild V 27 dir 1-183913.0.r234301/7730 K 2 np V 28 dir 1-234243.0.r243682/46209 K 10 nwhitehorn V 27 dir 1-209626.0.r219002/1398 K 4 nyan V 25 dir 1-183793.0.r221739/17 K 6 obrien V 27 dir 1-223658.0.r236423/6719 K 5 peter V 26 dir 1-180165.0.r194308/499 K 9 pgollucci V 25 dir 1-210277.0.r212598/17 K 3 pho V 28 dir 1-237221.0.r243902/16368 K 4 piso V 28 dir 1-190859.0.r191123/13329 K 6 qingli V 25 dir 1-185818.0.r185926/17 K 5 rafan V 29 dir 1-184791.0.r184800/106660 K 6 rpaulo V 27 dir 1-183745.0.r201618/1036 K 3 sam V 27 dir 1-186655.0.r188169/9175 K 6 sbruno V 27 dir 1-227643.0.r231056/4872 K 5 simon V 26 dir 1-220972.0.r220973/470 K 7 thompsa V 25 dir 1-185730.0.r208057/17 K 3 uqs V 27 dir 1-241674.0.r243985/2910 K 7 weongyo V 28 dir 1-212249.0.r215346/18411 END ENDREP id: a-1.0.r243985/5618 type: dir pred: a-1.0.r243984/6638 count: 5239 text: 243985 3076 2529 2529 aef2d78f3d143fb1d2e816c1bfaaa4e1 cpath: /user copyroot: 0 / minfo-cnt: 8490 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 24 dir 5-1.0.r243981/183363 K 8 projects V 23 dir 6-1.0.r243979/48471 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 23 dir 9-1.0.r243983/61910 K 8 svnadmin V 27 dir 0-179447.0.r243886/1267 K 4 user V 22 dir a-1.0.r243985/5618 K 6 vendor V 22 dir b-1.0.r243889/8552 K 13 vendor-crypto V 25 dir 0-1575.0.r239851/3086 K 10 vendor-sys V 27 dir 0-12116.0.r243395/19826 END ENDREP id: 0.0.r243985/6322 type: dir pred: 0.0.r243984/7343 count: 243985 text: 243985 5793 516 516 837c56f920df7b9e76092e3801bd7ed4 cpath: / copyroot: 0 / minfo-cnt: 29454 5-243984.0.t243984-589c modify-file true false /user/uqs/git_conv/svn2git/src/Makefile q-243982.0.t243984-589c modify-file true false /user/uqs/git_conv/svn2git/src/svn.cpp 6322 6490