{"id":15658,"date":"2023-02-07T22:01:05","date_gmt":"2023-02-07T14:01:05","guid":{"rendered":"https:\/\/docs.pingcode.com\/?p=15658"},"modified":"2023-02-07T22:01:43","modified_gmt":"2023-02-07T14:01:43","slug":"svn%e5%92%8cgit%e6%9c%89%e5%93%aa%e4%ba%9b%e5%8c%ba%e5%88%ab","status":"publish","type":"post","link":"https:\/\/docs.pingcode.com\/ask\/15658.html","title":{"rendered":"SVN\u548cGIT\u6709\u54ea\u4e9b\u533a\u522b"},"content":{"rendered":"\n
\n

SVN\u548cGIT\u7684\u533a\u522b\u662f\uff1a1\u3001\u6a21\u5f0f\u4e0d\u540c\uff1b2\u3001\u5b58\u50a8\u65b9\u5f0f\u4e0d\u540c\uff1b3\u3001\u7248\u672c\u53f7\u4e0d\u540c\uff1b4\u3001\u5206\u652f\u4e0d\u540c\u3002SVN\u662fsubversion\u7684\u7f29\u5199\uff0c\u662f\u4e00\u4e2a\u5f00\u653e\u6e90\u4ee3\u7801\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u901a\u8fc7\u91c7\u7528\u5206\u652f\u7ba1\u7406\u7cfb\u7edf\u7684\u9ad8\u6548\u7ba1\u7406\uff0c\u7b80\u800c\u8a00\u4e4b\u5c31\u662f\u7528\u4e8e\u591a\u4e2a\u4eba\u5171\u540c\u5f00\u53d1\u540c\u4e00\u4e2a\u9879\u76ee\uff0c\u5b9e\u73b0\u5171\u4eab\u8d44\u6e90\uff0c\u5b9e\u73b0\u6700\u7ec8\u96c6\u4e2d\u5f0f\u7684\u7ba1\u7406\u3002<\/p>\n<\/blockquote>\n\n\n

\n
\"\"<\/figure><\/div>\n\n\n

\u4e00\u3001SVN\u548cGIT\u7684\u533a\u522b<\/h2>\n\n\n\n

1\u3001\u6a21\u5f0f\u4e0d\u540c<\/h3>\n\n\n\n

GIT\u662f\u5206\u5e03\u5f0f\u7684\uff0cSVN\u4e0d\u662f\uff0c\u8fd9\u662fGIT\u548c\u5176\u5b83\u975e\u5206\u5e03\u5f0f\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u4f8b\u5982SVN\uff0cCVS\u7b49\uff0c\u6700\u6838\u5fc3\u7684\u533a\u522b\u3002<\/p>\n\n\n\n

GIT\u8ddfSVN\u4e00\u6837\u6709\u81ea\u5df1\u7684\u96c6\u4e2d\u5f0f\u7248\u672c\u5e93\u6216\u670d\u52a1\u5668\u3002\u4f46\uff0cGIT\u66f4\u503e\u5411\u4e8e\u88ab\u4f7f\u7528\u4e8e\u5206\u5e03\u5f0f\u6a21\u5f0f\uff0c\u4e5f\u5c31\u662f\u6bcf\u4e2a\u5f00\u53d1\u4eba\u5458\u4ece\u4e2d\u5fc3\u7248\u672c\u5e93\/\u670d\u52a1\u5668\u4e0achect out\u4ee3\u7801\u540e\u4f1a\u5728\u81ea\u5df1\u7684\u673a\u5668\u4e0a\u514b\u9686\u4e00\u4e2a\u81ea\u5df1\u7684\u7248\u672c\u5e93\u3002<\/p>\n\n\n\n

\u56e0\u4e3a\u6bcf\u4e00\u4e2a\u5f00\u53d1\u4eba\u5458\u7684\u7535\u8111\u4e0a\u90fd\u6709\u4e00\u4e2aLocal Repository,\u6240\u4ee5\u5373\u4f7f\u6ca1\u6709\u7f51\u7edc\u4e5f\u4e00\u6837\u53ef\u4ee5Commit\uff0c\u67e5\u770b\u5386\u53f2\u7248\u672c\u8bb0\u5f55\uff0c\u521b\u5efa\u9879\u76ee\u5206\u652f\u7b49\u64cd\u4f5c\uff0c\u7b49\u7f51\u7edc\u518d\u6b21\u8fde\u63a5\u4e0aPush\u5230Server\u7aef\u3002<\/p>\n\n\n\n

2\u3001\u5b58\u50a8\u65b9\u5f0f\u4e0d\u540c<\/h3>\n\n\n\n

GIT\u628a\u5185\u5bb9\u6309\u5143\u6570\u636e\u65b9\u5f0f\u5b58\u50a8\uff0c\u800cSVN\u662f\u6309\u6587\u4ef6\u3002<\/p>\n\n\n\n

\u56e0\u4e3a,GIT\u76ee\u5f55\u662f\u5904\u4e8e\u4f60\u7684\u673a\u5668\u4e0a\u7684\u4e00\u4e2a\u514b\u9686\u7248\u7684\u7248\u672c\u5e93\uff0c\u5b83\u62e5\u6709\u4e2d\u5fc3\u7248\u672c\u5e93\u4e0a\u6240\u6709\u7684\u4e1c\u897f\uff0c\u4f8b\u5982\u6807\u7b7e\uff0c\u5206\u652f\uff0c\u7248\u672c\u8bb0\u5f55\u7b49\u3002.GIT\u76ee\u5f55\u7684\u4f53\u79ef\u5927\u5c0f\u8ddf.SVN\u6bd4\u8f83\uff0c\u4f60\u4f1a\u53d1\u73b0\u5b83\u4eec\u5dee\u8ddd\u5f88\u5927\u3002<\/p>\n\n\n\n

3\u3001\u7248\u672c\u53f7\u4e0d\u540c<\/h3>\n\n\n\n

GIT\u7248\u672c\u53f7\u662f\u5168\u7403\u5c11\u6570\u7684\uff0c\u800cSVN\u7248\u672c\u53f7\u662f\u5168\u5c40\u5c11\u6570\u7684\u3002<\/p>\n\n\n\n

\u5728\u4f7f\u7528\u4e2d\uff0c\u53d1\u73b0\uff0c\u6bcf\u6b21\u5bf9\u6574\u4e2a\u76ee\u5f55\u8fdb\u884c\u63d0\u4ea4\uff0cSVN\u662f\u628a\u6240\u6709\u6587\u4ef6\u65e0\u8bba\u6709\u65e0\u66f4\u65b0\u90fd\u6253\u4e0a\u7248\u672c\u53f7\uff0c\u800cGIT\u5219\u53ea\u662f\u5bf9\u66f4\u65b0\u6587\u4ef6\u8fdb\u884c\u6253\u7248\u672c\u53f7\u3002<\/p>\n\n\n\n

4\u3001\u5206\u652f\u4e0d\u540c<\/h3>\n\n\n\n

\u5206\u652f\u5728SVN\u4e2d\u4e00\u70b9\u4e0d\u7279\u522b\uff0c\u5c31\u662f\u7248\u672c\u5e93\u4e2d\u7684\u53e6\u5916\u7684\u4e00\u4e2a\u76ee\u5f55\u3002\u5982\u679c\u4f60\u60f3\u77e5\u9053\u662f\u5426\u5408\u5e76\u4e86\u4e00\u4e2a\u5206\u652f\uff0c\u4f60\u9700\u8981\u624b\u5de5\u8fd0\u884c\u50cf\u8fd9\u6837\u7684\u547d\u4ee4svn propget svn:mergeinfo\uff0c\u6765\u786e\u8ba4\u4ee3\u7801\u662f\u5426\u88ab\u5408\u5e76\u3002\u6240\u4ee5\uff0c\u7ecf\u5e38\u4f1a\u53d1\u751f\u6709\u4e9b\u5206\u652f\u88ab\u9057\u6f0f\u7684\u60c5\u51b5\u3002<\/p>\n\n\n\n

\u7136\u800c\uff0c\u5904\u7406GIT \u7684\u5206\u652f\u5374\u662f\u76f8\u5f53\u7684\u7b80\u5355\u548c\u6709\u8da3\uff0c\u4f60\u53ef\u4ee5\u4ece\u540c\u4e00\u4e2a\u5de5\u4f5c\u76ee\u5f55\u4e0b\u5feb\u901f\u7684\u5728\u51e0\u4e2a\u5206\u652f\u95f4\u5207\u6362\u3002\u4f60\u5f88\u5bb9\u6613\u53d1\u73b0\u672a\u88ab\u5408\u5e76\u7684\u5206\u652f\uff0c\u4f60\u80fd\u7b80\u5355\u800c\u5feb\u6377\u7684\u5408\u5e76\u8fd9\u4e9b\u6587\u4ef6\u3002\u56e0\u4e3agit\u662f\u57fa\u4e8e\u5dee\u5f02\u6765\u7ba1\u7406\u5206\u652f\u7684\uff0c\u5176\u5206\u652f\u7684\u4ee3\u4ef7\u6781\u5c0f\u3002
<\/p>\n\n\n\n

\u5ef6\u4f38\u9605\u8bfb\uff1a<\/strong><\/p>\n\n\n\n

<\/p>\n\n\n\n

\u4e8c\u3001\u4ec0\u4e48\u662fSVN<\/h2>\n\n\n\n

SVN\u662fsubversion\u7684\u7f29\u5199\uff0c\u662f\u4e00\u4e2a\u5f00\u653e\u6e90\u4ee3\u7801\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u901a\u8fc7\u91c7\u7528\u5206\u652f\u7ba1\u7406\u7cfb\u7edf\u7684\u9ad8\u6548\u7ba1\u7406\uff0c\u7b80\u800c\u8a00\u4e4b\u5c31\u662f\u7528\u4e8e\u591a\u4e2a\u4eba\u5171\u540c\u5f00\u53d1\u540c\u4e00\u4e2a\u9879\u76ee\uff0c\u5b9e\u73b0\u5171\u4eab\u8d44\u6e90\uff0c\u5b9e\u73b0\u6700\u7ec8\u96c6\u4e2d\u5f0f\u7684\u7ba1\u7406\u3002<\/p>\n\n\n\n

SVN\u7684\u5168\u79f0\u5f0fSubversion\uff0c\u5373\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u3002\u5b83\u662f\u6700\u6d41\u884c\u7684\u4e00\u4e2a\u5f00\u653e\u6e90\u4ee3\u7801\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\u3002\u4f5c\u4e3a\u4e00\u4e2a\u5f00\u6e90\u7684\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0cSubversion\u7ba1\u7406\u968f\u7740\u65f6\u95f4\u6539\u53d8\u7684\u6570\u636e\u3002\u8fd9\u4e9b\u6570\u636e\u653e\u7f6e\u5728\u4e00\u4e2a\u4e2d\u592e\u8d44\u6599\u6863\u6848\u5e93\u4e2d\u3002\u8fd9\u4e2a\u6863\u6848\u5e93\u5f88\u50cf\u4e00\u4e2a\u666e\u901a\u7684\u6587\u4ef6\u670d\u52a1\u5668\uff0c\u4e0d\u8fc7\u5b83\u4f1a\u8bb0\u4f4f\u6bcf\u4e00\u6b21\u6587\u4ef6\u7684\u53d8\u52a8\u3002\u8fd9\u6837\u53ef\u4ee5\u628a\u6863\u6848\u6062\u590d\u5230\u65e7\u7684\u7248\u672c\uff0c\u6216\u662f\u6d4f\u89c8\u6587\u4ef6\u7684\u53d8\u52a8\u5386\u53f2\u3002Subversion\u662f\u4e00\u4e2a\u901a\u7528\u7684\u7cfb\u7edf\uff0c\u53ef\u4ee5\u7528\u6765\u7ba1\u7406\u4efb\u4f55\u7c7b\u578b\u7684\u6587\u4ef6\uff0c\u5176\u4e2d\u5305\u62ec\u7a0b\u5e8f\u6e90\u4ee3\u7801\u3002<\/p>\n\n\n\n

SVN\u91c7\u7528\u5ba2\u6237\u7aef\/\u670d\u52a1\u7aef\u4f53\u7cfb\u4e5f\u5c31\u662f\u6211\u4eec\u5e38\u8bf4\u7684\uff08C\/S\u67b6\u6784\uff09\uff0c\u9879\u76ee\u7684\u5404\u79cd\u7248\u672c\u90fd\u5b58\u50a8\u5728\u670d\u52a1\u5668\u4e0a\uff0c\u7a0b\u5e8f\u5f00\u53d1\u4eba\u5458\u9996\u5148\u5c06\u4ece\u670d\u52a1\u5668\u4e0a\u83b7\u5f97\u4e00\u4efd\u9879\u76ee\u7684\u6700\u65b0\u7248\u672c\uff0c\u5e76\u5c06\u5176\u590d\u5236\u5230\u672c\u673a\uff0c\u7136\u540e\u518d\u6b64\u57fa\u7840\u4e0a\uff0c\u6bcf\u4e2a\u5f00\u53d1\u4eba\u5458\u53ef\u4ee5\u518d\u81ea\u5df1\u7684\u5ba2\u6237\u7aef\u8fdb\u884c\u72ec\u7acb\u7684\u5f00\u53d1\u5de5\u4f5c\uff0c\u5e76\u4e14\u53ef\u4ee5\u968f\u65f6\u5c06\u65b0\u4ee3\u7801\u63d0\u4ea4\u7ed9\u670d\u52a1\u5668\u3002\u5f53\u7136\u4e5f\u53ef\u4ee5\u901a\u8fc7\u66f4\u65b0\u64cd\u4f5c\u83b7\u53d6\u670d\u52a1\u5668\u4e0a\u7684\u6700\u65b0\u4ee3\u7801\uff0c\u4ece\u800c\u4fdd\u6301\u4e0e\u5176\u4ed6\u5f00\u53d1\u8005\u6240\u4f7f\u7528\u7248\u672c\u7684\u4e00\u81f4\u6027\u3002<\/p>\n\n\n\n

SVN\u7684\u5ba2\u6237\u7aef\u6709\u4e24\u7c7b\uff0c\u4e00\u7c7b\u662f\u57fa\u4e8eWeb\u7684WebSVN\u7b49\uff0c\u53e6\u4e00\u7c7b\u662f\u4ee5Tortoise SVN\u4e3a\u4ee3\u8868\u7684\u5ba2\u6237\u7aef\u8f6f\u4ef6\u3002\u524d\u8005\u9700\u8981Web\u670d\u52a1\u5668\u7684\u652f\u6301\uff0c\u540e\u8005\u9700\u8981\u5728\u672c\u5730\u5b89\u88c5\u5ba2\u6237\u7aef\uff0c\u4e24\u79cd\u90fd\u6709\u514d\u8d39\u7684\u5f00\u6e90\u8f6f\u4ef6\u4f9b\u4f7f\u7528\u3002SVN\u5b58\u50a8\u7248\u672c\u6570\u636e\u4e5f\u6709\u4e24\u79cd\u65b9\u5f0f\uff1aBDB\uff08\u4e00\u79cd\u4e8b\u52a1\u5b89\u5168\u578b\u8868\u7c7b\u578b\uff09\u548cFSFS\uff08\u4e00\u79cd\u4e0d\u9700\u8981\u6570\u636e\u5e93\u7684\u50a8\u5b58\u7cfb\u7edf\uff09<\/p>\n\n\n\n

<\/p>\n\n\n\n

\u4ee5\u4e0a\u5c31\u662f\u5173\u4e8eSVN\u548cGIT\u7684\u533a\u522b\u7684\u5185\u5bb9\u4e86\uff0c\u5e0c\u671b\u5bf9\u5927\u5bb6\u6709\u5e2e\u52a9\u3002<\/p>\n","protected":false},"excerpt":{"rendered":"SVN\u548cGIT\u7684\u533a\u522b\u662f\uff1a1\u3001\u6a21\u5f0f\u4e0d\u540c\uff1b2\u3001\u5b58\u50a8\u65b9\u5f0f\u4e0d\u540c\uff1b3\u3001\u7248\u672c\u53f7\u4e0d\u540c\uff1b4\u3001\u5206\u652f\u4e0d\u540c\u3002SVN\u662fsubversi […]","protected":false},"author":1,"featured_media":15659,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"_acf_changed":false,"footnotes":""},"categories":[37],"tags":[119],"acf":[],"_links":{"self":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/posts\/15658"}],"collection":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/comments?post=15658"}],"version-history":[{"count":0,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/posts\/15658\/revisions"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/media\/15659"}],"wp:attachment":[{"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/media?parent=15658"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/categories?post=15658"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/docs.pingcode.com\/wp-json\/wp\/v2\/tags?post=15658"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}