{"id":642,"date":"2012-08-22T13:11:24","date_gmt":"2012-08-22T05:11:24","guid":{"rendered":"https:\/\/yanjingang.com\/blog\/?p=642"},"modified":"2025-12-12T14:17:00","modified_gmt":"2025-12-12T06:17:00","slug":"svn%e7%9a%84%e5%9b%9e%e6%bb%9a%e6%93%8d%e4%bd%9c%ef%bc%88%e6%92%a4%e9%94%80%e4%bf%ae%e6%94%b9%ef%bc%89","status":"publish","type":"post","link":"https:\/\/yanjingang.com\/blog\/?p=642","title":{"rendered":"svn\u7684\u56de\u6eda\u64cd\u4f5c\uff08\u64a4\u9500\u4fee\u6539\uff09"},"content":{"rendered":"

\u6709\u65f6\u5019\u6211\u4eec\u60f3\u4e22\u5f03\u5bf9\u4ee3\u7801\u505a\u8fc7\u7684\u6539\u52a8\u3002\u00a0<\/span>
\n\u4e24\u79cd\u60c5\u51b5\uff1a\u00a0<\/span>
\n\u4e00\u3001\u6539\u52a8\u6ca1\u6709 check in\u3002\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u4f7f\u7528svn revert\u5c31\u80fd\u628a\u6539\u52a8\u7ed9\u6254\u6389\u4e86\u3002\u00a0<\/span>
\n\u63d0\u793a\uff1a\u591a\u6570\u7528\u6237\u4e60\u60ef\u4e8e\u53ea\u628a\u672c\u5730\u6539\u52a8\u8fc7\u7684\u6587\u4ef6\u5220\u6389\uff0c\u7136\u540e\u6267\u884c\u4e00\u6b21update\u6765\u8fd8\u539f\u6587\u4ef6\uff0c\u4f46\u6700\u4f73\u5b9e\u8df5\u662f\u6267\u884csvn revert\uff0c\u8fd9\u4e2a\u64cd\u4f5c\u4f1a\u66f4\u5b89\u5168\u4e5f\u66f4\u8fc5\u901f\u3002\u56e0\u4e3aupdate\u9700\u8981\u53bb\u8fde\u63a5\u670d\u52a1\u5668\u800c\u4f60\u6ca1\u6709\u51c6\u5907\u597d\u63a5\u53d7\u65b0\u7684\u6539\u52a8\uff0c\u800csvn revert\u4e0d\u4f1a\u8fde\u63a5\u670d\u52a1\u5668\u4e5f\u4e0d\u4f1a\u4ece\u670d\u52a1\u5668\u83b7\u53d6\u65b0\u7684\u6539\u52a8\u3002\u00a0<\/span><\/p>\n

\u4e8c\u3001\u6539\u52a8\u5df2\u7ecfcheck in\u3002\u00a0<\/span>
\n\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u6709\u591a\u79cd\u529e\u6cd5\u53ef\u4ee5\u8fdb\u884c\u64a4\u9500\u4fee\u6539\u3002\u4e00\u822c\u6211\u4eec\u63a8\u8350\u7528svn merge\u6765\u8fbe\u6210\u76ee\u7684\u3002\u00a0<\/span>
\n\u5178\u578b\u7684\u64cd\u4f5c\u8fc7\u7a0b\u5982\u4e0b\uff1a\u00a0<\/span>
\n1\u3001\u4fdd\u8bc1\u6211\u4eec\u62ff\u5230\u7684\u662f\u6700\u65b0\u4ee3\u7801\uff1a\u00a0<\/span>
\nsvn update\u00a0<\/span>
\n\u5047\u8bbe\u662f28\u7248\u672c\u3002\u00a0<\/span>
\n2\u3001\u7136\u540e\u627e\u51fa\u8981\u79fb\u9664\u7684\u786e\u5207\u7248\u672c\uff1a\u00a0<\/span>
\nsvn log contacts.java\u00a0<\/span>
\n\u6839\u636elog\u6000\u7591\u662f27\u7248\u672c\u6539\u574f\u7684\uff0c\u6bd4\u8f83\u4e00\u4e0b\uff1a\u00a0<\/span>
\nsvn diff -r 26:27 contacts.java\u00a0<\/span>
\n\u53d1\u73b0\u679c\u771f\u662f27\u7248\u672c\u574f\u4e8b\u3002\u00a0<\/span>
\n3\u3001\u64a4\u950027\u7248\u672c\u7684\u6539\u52a8\uff1a\u00a0<\/span>
\nsvn merge -r 27:26 contacts.java\u00a0<\/span>
\n\u4e3a\u4e86\u4fdd\u9669\u8d77\u89c1\uff0c\u518d\u6b21\u786e\u8ba4\u5408\u5e76\u7684\u7ed3\u679c\uff1a\u00a0<\/span>
\nsvn diff contacts.java\u00a0<\/span>
\n\u53d1\u73b0\u5df2\u6b63\u786e\u64a4\u9500\u4e86\u6539\u52a8\uff0c\u63d0\u4ea4\u3002\u00a0<\/span>
\n4\u3001\u63d0\u4ea4\u6539\u52a8\u00a0<\/span>
\nsvn commit -m “Revert wrong change from r27”\u00a0<\/span>
\n\u63d0\u4ea4\u540e\u7248\u672c\u53d8\u6210\u4e8629\u3002<\/p>\n

\u00a0<\/span><\/div>\n
\u4f7f\u7528windows\u73af\u5883\u4e0bTrotoiesSVN\u7684\u7528\u6237\uff1a<\/span><\/div>\n
\u00a01\u3001show log \uff0c\u627e\u5230\u8981\u64a4\u9500\u7684\u63d0\u4ea4\u8bb0\u5f55\u3002<\/span><\/div>\n
\u00a02\u3001\u5728\u9009\u4e2d\u8bb0\u5f55\u4e0a\u53f3\u4fa7\uff0c\u70b9Revert changes from this revision\uff0c\u6b64\u65f6\u672c\u5730\u4ee3\u7801\u4f1a\u64a4\u9500\u9009\u4e2d\u8bb0\u5f55\u90a3\u6b21\u7684\u6539\u52a8\u3002<\/span><\/div>\n
\u00a03\u3001svn commit\u3002<\/span><\/div>\n","protected":false},"excerpt":{"rendered":"

\u6709\u65f6\u5019\u6211\u4eec\u60f3\u4e22\u5f03\u5bf9\u4ee3\u7801\u505a\u8fc7\u7684\u6539\u52a8\u3002\u00a0 \u4e24\u79cd\u60c5\u51b5\uff1a\u00a0 \u4e00\u3001\u6539\u52a8\u6ca1\u6709 check in\u3002\u8fd9\u79cd\u60c5\u51b5\u4e0b\uff0c\u6211\u4eec\u4f7f\u7528svn […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":[],"categories":[142],"tags":[],"_links":{"self":[{"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/642"}],"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=642"}],"version-history":[{"count":1,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/642\/revisions"}],"predecessor-version":[{"id":10901,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/642\/revisions\/10901"}],"wp:attachment":[{"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=642"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=642"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/yanjingang.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=642"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}