{"id":3569,"date":"2018-06-09T17:56:26","date_gmt":"2018-06-09T09:56:26","guid":{"rendered":"http:\/\/switch.linesno.com\/?p=3569"},"modified":"2018-06-09T17:56:30","modified_gmt":"2018-06-09T09:56:30","slug":"svn%e5%88%86%e6%94%af%e7%ae%a1%e7%90%86%e7%9a%84%e4%bd%bf%e7%94%a8%e4%b8%8e%e7%bb%8f%e9%aa%8c","status":"publish","type":"post","link":"http:\/\/switch.linesno.com\/?p=3569","title":{"rendered":"svn\u5206\u652f\u7ba1\u7406\u7684\u4f7f\u7528\u4e0e\u7ecf\u9a8c"},"content":{"rendered":"

\u6700\u8fd1\u9879\u76ee\u7528\u4e0a\u4e86svn\u5206\u652f\u7ba1\u7406\uff0c\u56e0\u4e3a\u9879\u76ee\u592a\u8fc7\u5e9e\u6742\uff0c\u7248\u672c\u8fed\u4ee3\u4e5f\u8fc7\u4e8e\u9891\u7e41\uff0c\u81f4\u4f7f\u591a\u4e2a\u7248\u672c\u7684\u4ee3\u7801\u4ea4\u6742\u5728\u4e00\u8d77\uff0c\u96be\u4ee5\u7ef4\u62a4\uff0c\u65e0\u6cd5\u4fdd\u8bc1\u5176\u4e2d\u67d0\u4e2a\u7248\u672c\u7684\u7a33\u5b9a\u6027\u3002\u5f53\u7136\uff0c\u6211\u4eec\u4e5f\u7528\u8fc7\u5f88\u571f\u7684\u529e\u6cd5\uff0c\u4ee3\u7801\u590d\u5236\u4e00\u4efd\u51fa\u6765\uff0c\u4f46\u662f\uff0c\u8fd9\u4e2a\u526f\u672c\u4e5f\u9700\u8981\u52a0\u4e0a\u65b0\u5f00\u53d1\u7684\u529f\u80fd\u3002<\/p>\n

\u6240\u4ee5\uff0c\u6211\u4eec\u51b3\u5b9a\u4f7f\u7528svn\u5206\u652f\u7ba1\u7406\u3002\u5f53\u7136\uff0c\u8fd9\u6709\u4ee3\u4ef7\uff0csvn\u7248\u672c\u7ba1\u7406\u5bf9\u4e8c\u8fdb\u5236\u6587\u4ef6\u4e0d\u53cb\u597d\uff0c\u53ef\u80fd\u6587\u4ef6\u5206\u652f\u5408\u5e76\u65f6\u4e8c\u8fdb\u5236\u6587\u4ef6\u4f1a\u96be\u4ee5\u5904\u7406\u3002\uff08\u8fd9\u91cc\u8bf4\u7684\u4e8c\u8fdb\u5236\u6587\u4ef6\uff0c\u6cdb\u6307\u6240\u6709\u975e\u6587\u672c\u6587\u4ef6\uff0c\u6bd4\u5982\u8bf4\u7f8e\u672f\u8d44\u6e90\uff0c\u7b56\u5212\u6587\u6863\uff09<\/p>\n

<\/a>svn\u5206\u652f\u7b80\u8ff0<\/h2>\n

\u4f7f\u7528\u5206\u652f\u6700\u4e3b\u8981\u7684\u76ee\u7684\u662f\uff0c\u591a\u4e2a\u5206\u652f\u53ef\u4ee5\u5e76\u884c\uff0c\u76f8\u4e92\u4e0d\u5e72\u6270\uff0c\u800c\u4e14\u4efb\u4f55\u65f6\u5019\u90fd\u53ef\u4ee5\u5408\u5e76\u3002\u5176\u6b21\uff0c\u5bb9\u6613\u4fdd\u8bc1\u4e3b\u5e72\u7684\u7a33\u5b9a\u6027\u3002<\/p>\n

\u6ca1\u6709\u5206\u652f<\/strong>\u7684\u65f6\u5019\uff0c\u4f60\u7684svn\u53ef\u80fd\u662f\u8fd9\u6837\u7684\uff1a<\/p>\n

\"\"<\/p>\n

\u5c31\u4e00\u4efd\u4ee3\u7801\u5b58\u5728\u4e3b\u5e72\uff08trunk\uff09\uff0c\u5f53\u7136\u4e5f\u4e0d\u4f1a\u6709\u4e3b\u5e72\u8fd9\u4e2a\u8bf4\u6cd5\u3002\u5f00\u53d1\u5b8c1.0\uff0c\u7ee7\u7eed\u5f00\u53d12.0\uff0c\u7248\u672c\u4e00\u4e2a\u4e00\u4e2a\u8fed\u4ee3\u3002<\/p>\n

\u6709\u4e86\u5206\u652f<\/strong>\u540e\uff0c\u4f60\u7684svn\u53ef\u80fd\u5c31\u662f\u8fd9\u6837\u7684\u4e86\uff1a<\/p>\n

\"\"<\/p>\n

\u4e3b\u5e72\u7528\u6765\u5b58\u653e\u7a33\u5b9a\u7684\u4ee3\u7801\uff0c\u6bcf\u4e2a\u7248\u672c\u90fd\u4f1a\u5f00\u4e00\u4e2a\u5206\u652f\uff0c\u7b49\u7248\u672c\u5b8c\u6210\u540e\u518d\u5408\u5e76\u5230\u4e3b\u5e72\u3002\u7248\u672c\u4e00\u4e2a\u4e00\u4e2a\u8fed\u4ee3\uff0c\u4f46\u53ef\u4ee5\u5e76\u884c\u5f00\u53d1\u3002<\/p>\n

<\/a>svn\u5206\u652f\u7ba1\u7406<\/h2>\n

\u63a5\u4e0b\u6765\uff0c\u7b80\u5355\u8bb2\u89e3\u4e0b \u5982\u4f55\u4f7f\u7528svn\u505a\u5206\u652f\u7ba1\u7406\u3002<\/p>\n

\u7b2c\u4e00\u6b65\uff0c\u5efa\u7acb\u4e3b\u5e72\u5206\u652f\u76ee\u5f55\u7ed3\u6784<\/strong><\/p>\n

\"\"<\/p>\n

\u7b2c\u4e8c\u6b65\uff0c\u521b\u5efa\u5206\u652f<\/strong><\/p>\n

\u5728\u4e3b\u5e72\u76ee\u5f55 trunk \u53f3\u952e\uff0c\u5728svn\u83dc\u5355\u9009\u62e9\u00a0Branch\/tag…<\/p>\n

\"\"<\/p>\n

\u6b65\u9aa4\u2460\u662f\u5206\u652f\u5730\u5740\uff0c\u8fd9\u91cc\u76f4\u63a5\u4ee5 \/branches\/1<\/p>\n

\u6b65\u9aa4\u2461\u662f\u53d6trunk\u7248\u672c\uff0cHEAD revision\u8868\u793a\u6700\u65b0\u7248\u672c\uff0c\u5176\u4ed6\u53ef\u901a\u8fc7 show log\u9009\u62e9<\/p>\n

\u6267\u884c OK \u540e\uff0c\u5230\u00a0branches \u76ee\u5f55 svn update \u5c31\u53ef\u4ee5\u770b\u5230\u6700\u65b0\u7684\u5206\u652f\u4e86\u3002<\/p>\n

\u7b2c\u4e09\u6b65\uff0c\u5408\u5e76\u5206\u652f\u5230\u4e3b\u5e72<\/strong><\/p>\n

\u5206\u652f\u5c31\u662f\u5f00\u53d1\u76ee\u5f55\u4e86\uff0c\u73b0\u5728\u5206\u652f\u63d0\u4ea4\u4e00\u4e2a\u6587\u4ef6\u505a\u6d4b\u8bd5\u3002<\/p>\n

\"\"<\/p>\n

\u7136\u540e\uff0c\u5408\u5e76\u8fd9\u4e2a\u6587\u4ef6\u5206\u652f\u5230\u4e3b\u5e72\u3002<\/p>\n

\u73b0\u5728\u5230\u4e3b\u5e72\u76ee\u5f55\uff0c\u53f3\u952esvn\u83dc\u5355\u9009\u00a0Merge…<\/p>\n

\"\"<\/p>\n

\u8fd9\u4e2a\u662f\u5c06\u5206\u652f\u6216\u4e3b\u5e72\u7684\u4fee\u6539\u5408\u5e76\u5230\u5f53\u524d\u5de5\u4f5c\u76ee\u5f55\uff0c\u7ee7\u7eed\u5982\u4e0b\u3002<\/p>\n

\"\"<\/p>\n

\u63a5\u4e0b\u6765\u70b9\u5b8c\u6210\uff0c\u5982\u679c\u6ca1\u51b2\u7a81\u7684\u8bdd\uff0c\u5206\u652f\u6587\u4ef6\u5c31\u5408\u5230\u4e3b\u5e72\u4e86\u3002<\/p>\n

\u4f46\u8fd9\u91cc\u8fd8\u8981\u4e00\u4e2a\u64cd\u4f5c\uff0c\u5c31\u662f\u5728\u4e3b\u5e72\u63d0\u4ea4\u5206\u652f\u5408\u8fc7\u6765\u7684\u6587\u4ef6\u3002<\/p>\n

\"\"<\/p>\n

\u9898\u5916\u8bdd\uff0c\u4e4b\u6240\u4ee5\u8981\u6709\u8fd9\u4e00\u6b65\uff0c\u9664\u4e86\u5bf9\u5206\u652f\u5185\u5bb9\u8fdb\u4e00\u6b65\u4fee\u6539\uff0c\u8fd8\u53ef\u4ee5\u540c\u65f6\u5408\u5e76\u591a\u4e2a\u5206\u652f\u3002\u9009\u62e9\u6743\u4ea4\u7ed9\u7528\u6237\u3002<\/p>\n

\u53e6\u5916\uff0c\u4e3b\u5e72\u5185\u5bb9\u5408\u5230\u5206\u652f\uff0c\u4e5f\u662f\u4f7f\u7528\u00a0Merge \u547d\u4ee4\u3002<\/p>\n

<\/a>svn\u5206\u652f\u5e94\u7528<\/h2>\n

\u6839\u636e\u9879\u76ee\u7684\u4e0d\u540c\uff0c\u5b9e\u9645\u4e0a\u7684\u5206\u652f\u67b6\u6784\u4e5f\u4f1a\u4e0d\u540c\u3002\u4ee5\u6211\u4eec\u9879\u76ee\u4e3a\u4f8b\uff0c\u6211\u4eec\u662f\u505a\u6e38\u620f\u7684\uff0c\u9879\u76ee\u8fc7\u4e8e\u5e9e\u6742\uff0c\u7248\u672c\u8fed\u4ee3\u975e\u5e38\u9891\u7e41\u3002\u5728\u7248\u672c1.1\u8fd8\u6ca1\u5b8c\u6210\u65f6\uff0c\u6211\u4eec\u53ef\u80fd\u5c31\u8981\u5f00\u53d12.0\u7248\u672c\uff0c\u8fd9\u6837\uff0c\u7248\u672c1.1\u548c\u7248\u672c2.0\u5c31\u8981\u5e76\u884c\u5f00\u53d1\u3002\u800c\u4e14\uff0c\u6211\u4eec\u5bf9\u7a33\u5b9a\u6027\u6709\u975e\u5e38\u9ad8\u7684\u8981\u6c42\u3002<\/p>\n

\u4e3a\u6b64\uff0c\u6211\u4eec\u8bbe\u8ba1\u4e86\u8fd9\u6837\u7684svn\u67b6\u6784\u3002<\/p>\n

\"\"<\/p>\n

\u6d4b\u8bd5\u5206\u652f<\/strong><\/p>\n

\u4e3a\u4e86\u4fdd\u8bc1\u4e3b\u5e72\u7a33\u5b9a\uff0c\u6211\u4eec\u52a0\u4e86\u6d4b\u8bd5\u5206\u652f\uff08\u5982 rel_1.1\u7684\u6d4b\u8bd5\u5206\u652f\u4e3a rel1.1_test \uff09\u3002\u6d4b\u8bd5\u5206\u652f1.1\u662f\u5728\u5206\u652f1.1\u5f00\u53d1\u7ed3\u675f\u540e\u5f00\u7684\uff0c\u7b49\u5f85\u6d4b\u8bd5\u4fee\u590dbug\u5b8c\u6210\u540e\uff0c\u5c31\u4f1a\u628a\u6d4b\u8bd5\u5206\u652f1.1\u5408\u5165\u4e3b\u5e72\u53ca\u5206\u652f1.1\u3002\u5408\u5e76\u5b8c\u6210\u540e\uff0c\u8fd9\u4e2a\u6d4b\u8bd5\u5206\u652f\u5c06\u4f1a\u5173\u95ed\u3002<\/p>\n

\u591a\u5206\u652f\u5e76\u884c<\/strong><\/p>\n

\u56e0\u4e3a\u9879\u76ee\u9700\u6c42\u8f83\u591a\uff0c\u7248\u672c\u8fed\u4ee3\u7e41\u6742\uff0c\u6240\u4ee5\u5728\u7248\u672c1.1\u8fd8\u6ca1\u7ed3\u675f\u65f6\uff0c\u5c31\u5f00\u4e86\u7248\u672c2.0\u7684\u5206\u652f\u3002\u5f53\u5206\u652f2.0\u9700\u8981\u6d4b\u8bd5\u5408\u5e76\u5230\u4e3b\u5e72\u65f6\uff0c\u5c31\u4f1a\u4ece\u4e3b\u5e72\u5408\u5e76\u6700\u65b0\u7684\u6587\u4ef6\u52302.0\u6d4b\u8bd5\u5206\u652f\uff0c\u6d4b\u8bd5\u901a\u8fc7\u540e\uff0c\u518d\u5408\u5e76\u5230\u4e3b\u5e72\u3002<\/p>\n

\u5206\u652f\u5408\u5e76\u7684\u65f6\u673a<\/strong><\/p>\n

\u5bf9\u6211\u4eec\u800c\u8a00\uff0c\u4e0d\u540c\u5206\u652f\u7684\u6700\u5927\u533a\u522b\u662f\u529f\u80fd\u4e0a\u7ebf\u7684\u65f6\u95f4\u70b9\u3002\u6211\u4eec\u6839\u636e\u4e0a\u7ebf\u5468\u671f\u5212\u5206\u529f\u80fd\uff0c\u62c6\u5206\u5230\u4e0d\u540c\u5206\u652f\u3002\u56e0\u4e3a\u5f00\u53d1\u9700\u6c42\u591a\uff0c\u8fed\u4ee3\u8fc7\u4e8e\u9891\u7e41\uff0c\u6240\u4ee5\u9760\u540e\u7684\u5206\u652f\u5bf9\u6bd4\u4e4b\u524d\u7684\u5206\u652f\u901a\u5e38\u53ea\u662f\u591a\u4e86\u67d0\u4e9b\u65b0\u529f\u80fd\u3002\u8fd9\u6837\uff0c\u5206\u652f\u7684\u51fa\u73b0\uff0c\u907f\u514d\u4e86\u672a\u5f00\u53d1\u5b8c\u6210\u7684\u529f\u80fd\u5f71\u54cd\u4e86\u5df2\u5f00\u53d1\u5b8c\u7684\u529f\u80fd\uff0c\u5bfc\u81f4\u5f53\u524d\u7248\u672c\u7684\u4e0d\u7a33\u5b9a\u3002\u6240\u4ee5\uff0c\u5408\u5e76\u5206\u652f\u7684\u65f6\u673a\u5c31\u662f\u8fd9\u4e2a\u5206\u652f\u7684\u529f\u80fd\u8981\u4e0d\u8981\u4e0a\u7ebf\u3002<\/p>\n

\u8fd9\u6837\uff0c\u4e3b\u5e72\u6c38\u8fdc\u662f\u7a33\u5b9a\u7684\uff0c\u4e5f\u53ea\u6709\u7ecf\u8fc7\u6d4b\u8bd5\u7684\u5185\u5bb9\uff0c\u624d\u4f1a\u5408\u5165\u4e3b\u5e72\u3002\u540c\u65f6\uff0c\u591a\u4e2a\u7248\u672c\u4e5f\u53ef\u4ee5\u5e76\u884c\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"

\u6700\u8fd1\u9879\u76ee\u7528\u4e0a\u4e86svn\u5206\u652f\u7ba1\u7406\uff0c\u56e0\u4e3a\u9879\u76ee\u592a\u8fc7\u5e9e\u6742\uff0c\u7248\u672c\u8fed\u4ee3\u4e5f\u8fc7\u4e8e\u9891\u7e41\uff0c\u81f4\u4f7f\u591a\u4e2a\u7248\u672c\u7684\u4ee3\u7801\u4ea4\u6742\u5728\u4e00\u8d77\uff0c\u96be\u4ee5\u7ef4\u62a4\uff0c\u65e0 […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[82],"tags":[],"class_list":["post-3569","post","type-post","status-publish","format-standard","hentry","category-javase"],"_links":{"self":[{"href":"http:\/\/switch.linesno.com\/index.php?rest_route=\/wp\/v2\/posts\/3569","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/switch.linesno.com\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/switch.linesno.com\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/switch.linesno.com\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/switch.linesno.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=3569"}],"version-history":[{"count":1,"href":"http:\/\/switch.linesno.com\/index.php?rest_route=\/wp\/v2\/posts\/3569\/revisions"}],"predecessor-version":[{"id":3579,"href":"http:\/\/switch.linesno.com\/index.php?rest_route=\/wp\/v2\/posts\/3569\/revisions\/3579"}],"wp:attachment":[{"href":"http:\/\/switch.linesno.com\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=3569"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/switch.linesno.com\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=3569"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/switch.linesno.com\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=3569"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}