{"id":1877,"date":"2012-06-09T17:16:00","date_gmt":"2012-06-09T09:16:00","guid":{"rendered":""},"modified":"2012-06-09T17:16:00","modified_gmt":"2012-06-09T09:16:00","slug":"","status":"publish","type":"post","link":"https:\/\/kyle.ai\/blog\/1877.html","title":{"rendered":"\u8be6\u89e3Linux\u547d\u4ee4\u884c\u4e0b\u5e38\u7528svn\u547d\u4ee4"},"content":{"rendered":"<p><html><head><meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\" \/><title>\u8be6\u89e3Linux\u547d\u4ee4\u884c\u4e0b\u5e38\u7528svn\u547d\u4ee4<\/title><\/head><body><\/p>\n<h1 style=\"display:none\">\u8be6\u89e3Linux\u547d\u4ee4\u884c\u4e0b\u5e38\u7528svn\u547d\u4ee4<\/h1>\n<div>\n<p>1\u3001Linux\u547d\u4ee4\u884c\u4e0b\u5c06\u6587\u4ef6checkout\u5230\u672c\u5730\u76ee\u5f55<\/p>\n<p>svn checkout path\uff08path\u662f\u670d\u52a1\u5668\u4e0a\u7684\u76ee\u5f55\uff09<\/p>\n<p>\u4f8b\u5982\uff1asvn checkout svn:\/\/192.168.1.1\/pro\/domain<\/p>\n<p>\u7b80\u5199\uff1asvn co<\/p>\n<p>2\u3001Linux\u547d\u4ee4\u884c\u4e0b\u5f80\u7248\u672c\u5e93\u4e2d\u6dfb\u52a0\u65b0\u7684\u6587\u4ef6<\/p>\n<p>svn add file<\/p>\n<p>\u4f8b\u5982\uff1asvn add test.php(\u6dfb\u52a0test.php)<\/p>\n<p>svn add *.php(\u6dfb\u52a0\u5f53\u524d\u76ee\u5f55\u4e0b\u6240\u6709\u7684php\u6587\u4ef6)<\/p>\n<p>3\u3001Linux\u547d\u4ee4\u884c\u4e0b\u5c06\u6539\u52a8\u7684\u6587\u4ef6\u63d0\u4ea4\u5230\u7248\u672c\u5e93<\/p>\n<p>svn commit -m \u201cLogMessage\u201c [-N] [&#8211;no-unlock] PATH(\u5982\u679c\u9009\u62e9\u4e86\u4fdd\u6301\u9501\uff0c\u5c31\u4f7f\u7528\u2013no-unlock\u5f00\u5173)<\/p>\n<p>\u4f8b\u5982\uff1asvn commit -m \u201cadd test file for my test\u201c test.php<\/p>\n<p>\u7b80\u5199\uff1asvn ci<\/p>\n<p>4\u3001Linux\u547d\u4ee4\u884c\u4e0b\u7684\u52a0\u9501\/\u89e3\u9501<\/p>\n<p>svn lock -m \u201cLockMessage\u201c [&#8211;force] PATH<\/p>\n<p>\u4f8b\u5982\uff1asvn lock -m \u201clock test file\u201c test.php<\/p>\n<p>svn unlock PATH<\/p>\n<p>5\u3001Linux\u547d\u4ee4\u884c\u4e0b\u66f4\u65b0\u5230\u67d0\u4e2a\u7248\u672c<\/p>\n<p>svn update -r m path<\/p>\n<p>\u4f8b\u5982\uff1a<\/p>\n<p>svn update\u5982\u679c\u540e\u9762\u6ca1\u6709\u76ee\u5f55\uff0c\u9ed8\u8ba4\u5c06\u5f53\u524d\u76ee\u5f55\u4ee5\u53ca\u5b50\u76ee\u5f55\u4e0b\u7684\u6240\u6709\u6587\u4ef6\u90fd\u66f4\u65b0\u5230\u6700\u65b0\u7248\u672c\u3002<\/p>\n<p>svn update -r 200 test.php(\u5c06\u7248\u672c\u5e93\u4e2d\u7684\u6587\u4ef6test.php\u8fd8\u539f\u5230\u7248\u672c200)<\/p>\n<p>svn update test.php(\u66f4\u65b0\uff0c\u4e8e\u7248\u672c\u5e93\u540c\u6b65\u3002\u5982\u679c\u5728\u63d0\u4ea4\u7684\u65f6\u5019\u63d0\u793a\u8fc7\u671f\u7684\u8bdd\uff0c\u662f\u56e0\u4e3a\u51b2\u7a81\uff0c\u9700\u8981\u5148update\uff0c\u4fee\u6539\u6587\u4ef6\uff0c\u7136\u540e\u6e05\u9664svn resolved\uff0c\u6700\u540e\u518d\u63d0\u4ea4commit)<\/p>\n<p>\u7b80\u5199\uff1asvn up<\/p>\n<p>6\u3001Linux\u547d\u4ee4\u884c\u4e0b\u67e5\u770b\u6587\u4ef6\u6216\u8005\u76ee\u5f55\u72b6\u6001<\/p>\n<p>1\uff09svn status path\uff08\u76ee\u5f55\u4e0b\u7684\u6587\u4ef6\u548c\u5b50\u76ee\u5f55\u7684\u72b6\u6001\uff0c\u6b63\u5e38\u72b6\u6001\u4e0d\u663e\u793a\uff09<\/p>\n<p>\u3010?\uff1a\u4e0d\u5728svn\u7684\u63a7\u5236\u4e2d\uff1bM\uff1a\u5185\u5bb9\u88ab\u4fee\u6539\uff1bC\uff1a\u53d1\u751f\u51b2\u7a81\uff1bA\uff1a\u9884\u5b9a\u52a0\u5165\u5230\u7248\u672c\u5e93\uff1bK\uff1a\u88ab\u9501\u5b9a\u3011<\/p>\n<p>2\uff09svn status -v path(\u663e\u793a\u6587\u4ef6\u548c\u5b50\u76ee\u5f55\u72b6\u6001)<\/p>\n<p>\u7b2c\u4e00\u5217\u4fdd\u6301\u76f8\u540c\uff0c\u7b2c\u4e8c\u5217\u663e\u793a\u5de5\u4f5c\u7248\u672c\u53f7\uff0c\u7b2c\u4e09\u548c\u7b2c\u56db\u5217\u663e\u793a\u6700\u540e\u4e00\u6b21\u4fee\u6539\u7684\u7248\u672c\u53f7\u548c\u4fee\u6539\u4eba\u3002<\/p>\n<p>\u6ce8\uff1asvn status\u3001svn diff\u548c svn revert\u8fd9\u4e09\u6761\u547d\u4ee4\u5728\u6ca1\u6709\u7f51\u7edc\u7684\u60c5\u51b5\u4e0b\u4e5f\u53ef\u4ee5\u6267\u884c\u7684\uff0c\u539f\u56e0\u662fsvn\u5728\u672c\u5730\u7684.svn\u4e2d\u4fdd\u7559\u4e86\u672c\u5730\u7248\u672c\u7684\u539f\u59cb\u62f7\u8d1d\u3002<\/p>\n<p>\u7b80\u5199\uff1asvn st<\/p>\n<p>7\u3001Linux\u547d\u4ee4\u884c\u4e0b\u5220\u9664\u6587\u4ef6<\/p>\n<p>svn delete path -m \u201cdelete test fle\u201c<\/p>\n<p>\u4f8b\u5982\uff1asvn delete svn:\/\/192.168.1.1\/pro\/domain\/test.php -m \u201cdelete test file\u201d<\/p>\n<p>\u6216\u8005\u76f4\u63a5svn delete test.php \u7136\u540e\u518dsvn ci -m \u2018delete test file\u2018\uff0c\u63a8\u8350\u4f7f\u7528\u8fd9\u79cd<\/p>\n<p>\u7b80\u5199\uff1asvn (del, remove, rm)<\/p>\n<p>8\u3001Linux\u547d\u4ee4\u884c\u4e0b\u67e5\u770b\u65e5\u5fd7<\/p>\n<p>svn log path<\/p>\n<p>\u4f8b\u5982\uff1asvn log test.php \u663e\u793a\u8fd9\u4e2a\u6587\u4ef6\u7684\u6240\u6709\u4fee\u6539\u8bb0\u5f55\uff0c\u53ca\u5176\u7248\u672c\u53f7\u7684\u53d8\u5316<\/p>\n<p>9\u3001Linux\u547d\u4ee4\u884c\u4e0b\u67e5\u770b\u6587\u4ef6\u8be6\u7ec6\u4fe1\u606f<\/p>\n<p>svn info path<\/p>\n<p>\u4f8b\u5982\uff1asvn info test.php<\/p>\n<p>10\u3001Linux\u547d\u4ee4\u884c\u4e0b\u6bd4\u8f83\u5dee\u5f02<\/p>\n<p>svn diff path(\u5c06\u4fee\u6539\u7684\u6587\u4ef6\u4e0e\u57fa\u7840\u7248\u672c\u6bd4\u8f83)<\/p>\n<p>\u4f8b\u5982\uff1asvn diff test.php<\/p>\n<p>svn diff -r m:n path(\u5bf9\u7248\u672cm\u548c\u7248\u672cn\u6bd4\u8f83\u5dee\u5f02)<\/p>\n<\/p>\n<p>\u4f8b\u5982\uff1asvn diff -r 200:201 test.php<\/p>\n<p>\u7b80\u5199\uff1asvn di<\/p>\n<p>11\u3001Linux\u547d\u4ee4\u884c\u4e0b\u5c06\u4e24\u4e2a\u7248\u672c\u4e4b\u95f4\u7684\u5dee\u5f02\u5408\u5e76\u5230\u5f53\u524d\u6587\u4ef6<\/p>\n<p>svn merge -r m:n path<\/p>\n<p>\u4f8b\u5982\uff1asvn merge -r 200:205 test.php\uff08\u5c06\u7248\u672c200\u4e0e205\u4e4b\u95f4\u7684\u5dee\u5f02\u5408\u5e76\u5230\u5f53\u524d\u6587\u4ef6\uff0c\u4f46\u662f\u4e00\u822c\u90fd\u4f1a\u4ea7\u751f\u51b2\u7a81\uff0c\u9700\u8981\u5904\u7406\u4e00\u4e0b\uff09<\/p>\n<p>12\u3001Linux\u547d\u4ee4\u884c\u4e0bSVN \u5e2e\u52a9<\/p>\n<p>svn help<\/p>\n<p>svn help ci<\/p>\n<p>\u4ee5\u4e0a\u662f\u5e38\u7528\u547d\u4ee4\uff0c\u4e0b\u9762\u5199\u51e0\u4e2a\u4e0d\u7ecf\u5e38\u7528\u7684<\/p>\n<p>13\u3001Linux\u547d\u4ee4\u884c\u4e0b\u7248\u672c\u5e93\u4e0b\u7684\u6587\u4ef6\u548c\u76ee\u5f55\u5217\u8868<\/p>\n<p>svn list path<\/p>\n<p>\u663e\u793apath\u76ee\u5f55\u4e0b\u7684\u6240\u6709\u5c5e\u4e8e\u7248\u672c\u5e93\u7684\u6587\u4ef6\u548c\u76ee\u5f55<\/p>\n<p>\u7b80\u5199\uff1asvn ls<\/p>\n<p>14\u3001Linux\u547d\u4ee4\u884c\u4e0b\u521b\u5efa\u7eb3\u5165\u7248\u672c\u63a7\u5236\u4e0b\u7684\u65b0\u76ee\u5f55<\/p>\n<p>svn mkdir: \u521b\u5efa\u7eb3\u5165\u7248\u672c\u63a7\u5236\u4e0b\u7684\u65b0\u76ee\u5f55\u3002<\/p>\n<p>\u7528\u6cd5: 1\u3001mkdir PATH\u2026<\/p>\n<p>2\u3001mkdir URL\u2026<\/p>\n<p>\u521b\u5efa\u7248\u672c\u63a7\u5236\u7684\u76ee\u5f55\u3002<\/p>\n<p>1\u3001\u6bcf\u4e00\u4e2a\u4ee5\u5de5\u4f5c\u526f\u672c PATH \u6307\u5b9a\u7684\u76ee\u5f55\uff0c\u90fd\u4f1a\u521b\u5efa\u5728\u672c\u5730\u7aef\uff0c\u5e76\u4e14\u52a0\u5165\u65b0\u589e\u8c03\u5ea6\uff0c\u4ee5\u5f85\u4e0b\u4e00\u6b21\u7684\u63d0\u4ea4\u3002<\/p>\n<p>2\u3001\u6bcf\u4e2a\u4ee5URL\u6307\u5b9a\u7684\u76ee\u5f55\uff0c\u90fd\u4f1a\u900f\u8fc7\u7acb\u5373\u63d0\u4ea4\u4e8e\u4ed3\u5e93\u4e2d\u521b\u5efa.\u5728\u8fd9\u4e24\u4e2a\u60c5\u51b5\u4e0b\uff0c\u6240\u6709\u7684\u4e2d\u95f4\u76ee\u5f55\u90fd\u5fc5\u987b\u4e8b\u5148\u5b58\u5728\u3002<\/p>\n<p>15\u3001Linux\u547d\u4ee4\u884c\u4e0b\u6062\u590d\u672c\u5730\u4fee\u6539<\/p>\n<p>svn revert: \u6062\u590d\u539f\u59cb\u672a\u6539\u53d8\u7684\u5de5\u4f5c\u526f\u672c\u6587\u4ef6 (\u6062\u590d\u5927\u90e8\u4efd\u7684\u672c\u5730\u4fee\u6539)\u3002revert:<\/p>\n<p>\u7528\u6cd5: revert PATH\u2026<\/p>\n<p>\u6ce8\u610f: \u672c\u5b50\u547d\u4ee4\u4e0d\u4f1a\u5b58\u53d6\u7f51\u7edc\uff0c\u5e76\u4e14\u4f1a\u89e3\u9664\u51b2\u7a81\u7684\u72b6\u51b5\u3002\u4f46\u662f\u5b83\u4e0d\u4f1a\u6062\u590d\u88ab\u5220\u9664\u7684\u76ee\u5f55<\/p>\n<p>16\u3001Linux\u547d\u4ee4\u884c\u4e0b\u4ee3\u7801\u5e93URL\u53d8\u66f4<\/p>\n<p>svn switch (sw): \u66f4\u65b0\u5de5\u4f5c\u526f\u672c\u81f3\u4e0d\u540c\u7684URL\u3002<\/p>\n<p>\u7528\u6cd5: 1\u3001switch URL [PATH]<\/p>\n<p>2\u3001switch \u2013relocate FROM TO [PATH&#8230;]<\/p>\n<p>1\u3001\u66f4\u65b0\u4f60\u7684\u5de5\u4f5c\u526f\u672c\uff0c\u6620\u5c04\u5230\u4e00\u4e2a\u65b0\u7684URL\uff0c\u5176\u884c\u4e3a\u8ddf\u201csvn update\u201d\u5f88\u50cf\uff0c\u4e5f\u4f1a\u5c06\u670d\u52a1\u5668\u4e0a\u6587\u4ef6\u4e0e\u672c\u5730\u6587\u4ef6\u5408\u5e76\u3002\u8fd9\u662f\u5c06\u5de5\u4f5c\u526f\u672c\u5bf9\u5e94\u5230\u540c\u4e00\u4ed3\u5e93\u4e2d\u67d0\u4e2a\u5206\u652f\u6216\u8005\u6807\u8bb0\u7684\u65b9\u6cd5\u3002<\/p>\n<p>2\u3001\u6539\u5199\u5de5\u4f5c\u526f\u672c\u7684URL\u5143\u6570\u636e\uff0c\u4ee5\u53cd\u6620\u5355\u7eaf\u7684URL\u4e0a\u7684\u6539\u53d8\u3002\u5f53\u4ed3\u5e93\u7684\u6839URL\u53d8\u52a8(\u6bd4\u5982\u65b9\u6848\u540d\u6216\u662f\u4e3b\u673a\u540d\u79f0\u53d8\u52a8)\uff0c\u4f46\u662f\u5de5\u4f5c\u526f\u672c\u4ecd\u65e7\u5bf9\u6620\u5230\u540c\u4e00\u4ed3\u5e93\u7684\u540c\u4e00\u76ee\u5f55\u65f6\u4f7f\u7528\u8fd9\u4e2a\u547d\u4ee4\u66f4\u65b0\u5de5\u4f5c\u526f\u672c\u4e0e\u4ed3\u5e93\u7684\u5bf9\u5e94\u5173\u7cfb\u3002<\/p>\n<p>17\u3001Linux\u547d\u4ee4\u884c\u4e0b\u89e3\u51b3\u51b2\u7a81<\/p>\n<p>svn resolved: \u79fb\u9664\u5de5\u4f5c\u526f\u672c\u7684\u76ee\u5f55\u6216\u6587\u4ef6\u7684\u201c\u51b2\u7a81\u201d\u72b6\u6001\u3002<\/p>\n<p>\u7528\u6cd5: resolved PATH\u2026<\/p>\n<p>\u6ce8\u610f: \u672c\u5b50\u547d\u4ee4\u4e0d\u4f1a\u4f9d\u8bed\u6cd5\u6765\u89e3\u51b3\u51b2\u7a81\u6216\u662f\u79fb\u9664\u51b2\u7a81\u6807\u8bb0\uff1b\u5b83\u53ea\u662f\u79fb\u9664\u51b2\u7a81\u7684\u76f8\u5173\u6587\u4ef6\uff0c\u7136\u540e\u8ba9 PATH \u53ef\u4ee5\u518d\u6b21\u63d0\u4ea4\u3002<\/p>\n<p>18\u3001Linux\u547d\u4ee4\u884c\u4e0b\u8f93\u51fa\u6307\u5b9a\u6587\u4ef6\u6216URL\u7684\u5185\u5bb9\u3002<\/p>\n<p>svn cat \u76ee\u6807[@\u7248\u672c]\u2026\u5982\u679c\u6307\u5b9a\u4e86\u7248\u672c\uff0c\u5c06\u4ece\u6307\u5b9a\u7684\u7248\u672c\u5f00\u59cb\u67e5\u627e\u3002<\/p>\n<p>svn cat -r PREV filename &gt; filename (PREV \u662f\u4e0a\u4e00\u7248\u672c,\u4e5f\u53ef\u4ee5\u5199\u5177\u4f53\u7248\u672c\u53f7,\u8fd9\u6837\u8f93\u51fa\u7ed3\u679c\u662f\u53ef\u4ee5\u63d0\u4ea4\u7684)<\/p>\n<p>\u4ee5\u4e0a\u662fLinux\u547d\u4ee4\u884c\u4e0b\u5e38\u7528svn\u547d\u4ee4\u7684\u4f7f\u7528\u65b9\u6cd5\u3002&nbsp;<\/p>\n<p>&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;-<\/p>\n<p><p><span>\u4eca\u5929\u5f88\u65e0\u804a\u7684\u6539\u4ee3\u7801\uff0c\u7ed3\u679c\u628a\u6b63\u786e\u7684\u7248\u672c\u7ed9\u4fee\u6539\u6389\u4e86\uff0c\u56e0\u4e3a\u5b9e\u5728linux\u7ec8\u7aef\u4e0a\uff0c\u6ca1\u6709\u56fe\u5f62\u754c\u9762\u7684svn\uff0c\u6240\u4ee5\u53ea\u80fd\u7528\u547d\u4ee4\u2026\u2026<\/span><\/p>\n<p><span>\u9996\u5148\u4fdd\u8bc1\u6211\u4eec\u62ff\u5230\u7684\u662f\u6700\u65b0\u4ee3\u7801\uff0c\u8fd0\u884csvn up\uff0c\u53d1\u73b0\u76ee\u524d\u662f29118\u7248\u672c\u3002 \u7136\u540e\u627e\u51fa\u8981\u64a4\u9500\u7684\u786e\u5207\u7248\u672c\uff1a<br \/><\/span><\/p>\n<p><span>svn log spp_xyserver.cpp<\/span><\/p>\n<p><span>\u6839\u636elog\u53d1\u73b0\u524d\u9762\u4e00\u4e2a\u7248\u672c\u662f29062\uff0c\u6bd4\u8f83\u4e00\u4e0b\uff1a<br \/><\/span><\/p>\n<p><span>svn diff&nbsp;<span style=\"color: #333399;\">&#8211;<\/span>r&nbsp;<span style=\"color: #6e00aa;\">29062<\/span><span style=\"color: #333399;\">:<\/span><span style=\"color: #6e00aa;\">29118<\/span>&nbsp;spp_xyserver.cpp<\/span><\/p>\n<p><span>\u786e\u8ba4\u65e0\u8bef\u540e\uff0c\u64a4\u950029118\u7248\u672c\u7684\u6539\u52a8\uff1a<br \/><\/span><\/p>\n<p><span>svn merge&nbsp;<span style=\"color: #333399;\">&#8211;<\/span>r&nbsp;<span style=\"color: #6e00aa;\">29118<\/span><span style=\"color: #333399;\">:<\/span><span style=\"color: #6e00aa;\">29062<\/span>&nbsp;spp_xyserver.cpp<\/span><\/p>\n<p><span>\u4fdd\u9669\u8d77\u89c1\uff0c\u786e\u8ba4\u5408\u5e76\u7684\u7ed3\u679c\uff1a<br \/><\/span><\/p>\n<p><span>svn diff spp_xyserver.cpp<\/span><\/p>\n<p><span>\u53d1\u73b0\u5df2\u6b63\u786e\u64a4\u9500\u4e86\u6539\u52a8\uff0c\u63d0\u4ea4\u3002 \u63d0\u4ea4\u6539\u52a8<br \/><\/span><\/p>\n<p><span>svn ci<\/span><\/p>\n<p><span>\u63d0\u4ea4\u540e\u7248\u672c\u53d8\u6210\u4e8629119\u3002<\/span><\/p>\n<\/p>\n<\/p>\n<\/div>\n<p><\/body><\/html><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u8be6\u89e3Linux\u547d\u4ee4\u884c\u4e0b\u5e38\u7528svn\u547d\u4ee4 \u8be6\u89e3Linux\u547d\u4ee4\u884c\u4e0b\u5e38\u7528svn\u547d\u4ee4 1\u3001Linux\u547d\u4ee4\u884c\u4e0b\u5c06\u6587\u4ef6che [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[4],"tags":[],"class_list":["post-1877","post","type-post","status-publish","format-standard","hentry","category-skill"],"_links":{"self":[{"href":"https:\/\/kyle.ai\/blog\/wp-json\/wp\/v2\/posts\/1877","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/kyle.ai\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/kyle.ai\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/kyle.ai\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/kyle.ai\/blog\/wp-json\/wp\/v2\/comments?post=1877"}],"version-history":[{"count":0,"href":"https:\/\/kyle.ai\/blog\/wp-json\/wp\/v2\/posts\/1877\/revisions"}],"wp:attachment":[{"href":"https:\/\/kyle.ai\/blog\/wp-json\/wp\/v2\/media?parent=1877"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/kyle.ai\/blog\/wp-json\/wp\/v2\/categories?post=1877"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/kyle.ai\/blog\/wp-json\/wp\/v2\/tags?post=1877"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}