{"id":167,"date":"2014-03-21T15:54:01","date_gmt":"2014-03-21T07:54:01","guid":{"rendered":"https:\/\/yanjingang.com\/blog\/?p=167"},"modified":"2025-12-12T14:16:02","modified_gmt":"2025-12-12T06:16:02","slug":"svn%e5%91%bd%e4%bb%a4%e8%a1%8c%e5%88%9b%e5%bb%ba%e5%88%a0%e9%99%a4%e5%90%88%e5%b9%b6-%e5%88%86%e6%94%af","status":"publish","type":"post","link":"https:\/\/yanjingang.com\/blog\/?p=167","title":{"rendered":"svn\u547d\u4ee4\u884c\u521b\u5efa\/\u5220\u9664\/\u5408\u5e76 \u5206\u652f"},"content":{"rendered":"<div>\u521b\u5efa\u5206\u652f<\/div>\n<p>svn cp -m &#8220;create branch&#8221; <a href=\"http:\/\/svn_server\/xxx_repository\/trunk\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/trunk<\/a> <a href=\"http:\/\/svn_server\/xxx_repository\/branches\/br_feature001%C2%A0\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/branches\/br_feature001\u00a0<\/a>;<\/p>\n<p>\u83b7\u5f97\u5206\u652f<\/p>\n<p>svn co <a href=\"http:\/\/svn_server\/xxx_repository\/branches\/br_feature001%C2%A0\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/branches\/br_feature001\u00a0<\/a>;<\/p>\n<p>\u5408\u5e76\u4e3b\u5e72\u4e0a\u7684\u6700\u65b0\u4ee3\u7801\u5230\u5206\u652f\u4e0a<\/p>\n<p>cd br_feature001<\/p>\n<p>svn merge <a href=\"http:\/\/svn_server\/xxx_repository\/trunk%C2%A0\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/trunk\u00a0<\/a>;<\/p>\n<p>\u5982\u679c\u9700\u8981\u9884\u89c8\u8be5\u5237\u65b0\u64cd\u4f5c\uff0c\u53ef\u4ee5\u4f7f\u7528svn mergeinfo\u547d\u4ee4\uff0c\u5982\uff1a<\/p>\n<p>svn mergeinfo <a href=\"http:\/\/svn_server\/xxx_repository\/trunk\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/trunk<\/a> &#8211;show-revs eligible<\/p>\n<p>\u6216\u4f7f\u7528svn merge &#8211;dry-run\u9009\u9879\u4ee5\u83b7\u53d6\u66f4\u4e3a\u8be6\u5c3d\u7684\u4fe1\u606f\u3002<\/p>\n<p>\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5e72<\/p>\n<p>\u4e00\u65e6\u5206\u652f\u4e0a\u7684\u5f00\u53d1\u7ed3\u675f\uff0c\u5206\u652f\u4e0a\u7684\u4ee3\u7801\u9700\u8981\u5408\u5e76\u5230\u4e3b\u5e72\u3002SVN\u4e2d\u6267\u884c\u8be5\u64cd\u4f5c\u9700\u8981\u5728trunk\u7684\u5de5\u4f5c\u76ee\u5f55\u4e0b\u8fdb\u884c\u3002\u547d\u4ee4\u5982\u4e0b\uff1a<\/p>\n<p>cd trunk<\/p>\n<p>svn merge &#8211;reintegrate <a href=\"http:\/\/svn_server\/xxx_repository\/branches\/br_feature001%C2%A0\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/branches\/br_feature001\u00a0<\/a>;<\/p>\n<p>\u5206\u652f\u5408\u5e76\u5230\u4e3b\u5e72\u4e2d\u5b8c\u6210\u540e\u5e94\u5f53\u5220\u8be5\u5206\u652f\uff0c\u56e0\u4e3a\u5728SVN\u4e2d\u8be5\u5206\u652f\u5df2\u7ecf\u4e0d\u80fd\u8fdb\u884c\u5237\u65b0\u4e5f\u4e0d\u80fd\u5408\u5e76\u5230\u4e3b\u5e72\u3002<\/p>\n<p>\u5408\u5e76\u7248\u672c\u5e76\u5c06\u5408\u5e76\u540e\u7684\u7ed3\u679c\u5e94\u7528\u5230\u73b0\u6709\u7684\u5206\u652f\u4e0a<\/p>\n<p>svn -r 148:149 merge <a href=\"http:\/\/svn_server\/xxx_repository\/trunk\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/trunk<\/a><\/p>\n<p>\u5efa\u7acbtags<\/p>\n<p>\u4ea7\u54c1\u5f00\u53d1\u5df2\u7ecf\u57fa\u672c\u5b8c\u6210\uff0c\u5e76\u4e14\u901a\u8fc7\u5f88\u4e25\u683c\u7684\u6d4b\u8bd5\uff0c\u8fd9\u65f6\u5019\u6211\u4eec\u5c31\u60f3\u53d1\u5e03\u7ed9\u5ba2\u6237\u4f7f\u7528\uff0c\u53d1\u5e03\u6211\u4eec\u76841.0\u7248\u672c<\/p>\n<p>svn copy <a href=\"http:\/\/svn_server\/xxx_repository\/trunk\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/trunk<\/a> <a href=\"http:\/\/svn_server\/xxx_repository\/tags\/release-1.0\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/tags\/release-1.0<\/a> -m &#8220;1.0 released&#8221;<\/p>\n<p>\u5220\u9664\u5206\u652f\u6216tags<\/p>\n<p>svn rm <a href=\"http:\/\/svn_server\/xxx_repository\/branches\/br_feature001\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/branches\/br_feature001<\/a><br \/>\nsvn rm <a href=\"http:\/\/svn_server\/xxx_repository\/tags\/release-1.0\" target=\"_blank\" rel=\"noopener\">http:\/\/svn_server\/xxx_repository\/tags\/release-1.0<\/a><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u521b\u5efa\u5206\u652f svn cp -m &#8220;create branch&#8221; http:\/\/svn_s [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[142],"tags":[146],"_links":{"self":[{"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/167"}],"collection":[{"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=167"}],"version-history":[{"count":1,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/167\/revisions"}],"predecessor-version":[{"id":10896,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/167\/revisions\/10896"}],"wp:attachment":[{"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=167"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=167"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=167"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}