{"id":339,"date":"2011-11-22T17:43:01","date_gmt":"2011-11-22T09:43:01","guid":{"rendered":"http:\/\/www.whitetrefoil.com\/blog\/?p=339"},"modified":"2011-11-22T17:43:01","modified_gmt":"2011-11-22T09:43:01","slug":"%e7%89%9b%e8%a7%92%e5%b0%96%e7%94%a8hg-rebase%e4%bb%85%e6%8c%aa%e5%8a%a8%e4%b8%80%e4%b8%aabranch%e7%9a%84%e6%9c%80%e6%97%a7%e4%b8%80%e9%83%a8%e5%88%86","status":"publish","type":"post","link":"https:\/\/www.whitetrefoil.com\/blog\/?p=339","title":{"rendered":"[\u725b\u89d2\u5c16]\u7528hg-rebase\u4ec5\u632a\u52a8\u4e00\u4e2abranch\u7684\u6700\u65e7\u4e00\u90e8\u5206"},"content":{"rendered":"<p><strong>\u672c\u6587\u5df2\u6709\u8ffd\u52a0\u5185\u5bb9\uff1a<a href=\"http:\/\/www.whitetrefoil.com\/blog\/2011\/12\/%E7%89%9B%E8%A7%92%E5%B0%96%E7%94%A8hg-rebase%E4%BB%85%E6%8C%AA%E5%8A%A8%E4%B8%80%E4%B8%AAbranch%E7%9A%84%E6%9C%80%E6%97%A7%E4%B8%80%E9%83%A8%E5%88%86-%E6%94%B9\/\" title=\"[\u725b\u89d2\u5c16]\u7528hg-rebase\u4ec5\u632a\u52a8\u4e00\u4e2abranch\u7684\u6700\u65e7\u4e00\u90e8\u5206 \u2013 \u6539\">[\u725b\u89d2\u5c16]\u7528hg-rebase\u4ec5\u632a\u52a8\u4e00\u4e2abranch\u7684\u6700\u65e7\u4e00\u90e8\u5206 \u2013 \u6539<\/a><\/strong><\/p>\n<p>\u6700\u8fd1\u521a\u521a\u5f00\u59cb\u5b66\u4e60git\u548chg\uff0c\u5bf9\u4e8egit\u7684\u5386\u53f2\u4fee\u8ba2\u529f\u80fd\u7231\u4e0d\u91ca\u624b\uff0c\u4f46\u662f\u5728hg\u4e0b\u60f3\u8981\u5982\u6b64\u5077\u5929\u6362\u65e5\u5c31\u6ca1\u90a3\u4e48\u65b9\u4fbf\u4e86\u3002\u5e78\u597d\u73b0\u5728\u6709\u4e86\u8bf8\u5982rebase\u3001mq\u7b49\u6269\u5c55\uff0c\u4e8b\u60c5\u53d8\u5f97\u5bb9\u6613\u4e86\u8bb8\u591a\u3002<\/p>\n<p>\u4e8b\u5b9e\u4e0a\u56fd\u5185\u7684hg\u5b66\u4e60\u8d44\u6599\u5f88\u5c11\uff0c\u672c\u4eba\u82f1\u6587\u6c34\u5e73\u5f88\u6b8b\uff0c\u4eca\u5929\u60f3\u5b9e\u73b0\u4e00\u4e2a\u529f\u80fd\uff0cGoogle\u534a\u5929\u5374\u65e0\u89e3\uff0c\u53ea\u597d\u81ea\u5df1\u60f3\u4e86\u4e2a\u6b6a\u95e8\u90aa\u9053\u7684\u529e\u6cd5\u7ed5\u8def\u5b9e\u73b0\uff0c\u603b\u89c9\u5f97hg\u5e94\u8be5\u6709\u5185\u7f6e\u4ec0\u4e48\u65b9\u6cd5\u53ef\u4ee5\u76f4\u63a5\u5b9e\u73b0\uff0c\u82e6\u4e8e\u4e0d\u8ba4\u8bc6\u4efb\u4f55VCS\u7684\u8fbe\u4eba\uff0c\u65e0\u5904\u6c42\u6559\u554a\u3002<\/p>\n<p>\u5b9e\u9645\u60c5\u51b5\u662f\u8fd9\u6837\u7684\uff0c\u56e0\u4e3a\u6211\u4f9d\u65e7\u559c\u7231\u4f7f\u7528branch\u800c\u4e0d\u662fbookmark\u6216\u8005mq\u6765\u5b9e\u73b0\u672c\u5730\u7684\u5f00\u53d1\u5206\u652f\uff0c\u7136\u540e\u5f53\u628adev\u5206\u652frebase\u5230\u4e3b\u5206\u652f\u65f6\uff0c\u6211\u5e0c\u671b\u5206\u6bb5\u9010\u6b65rebase\uff0c\u800c\u4e0d\u662f\u4e00\u80a1\u8111\u5168rebase\u8fc7\u53bb\uff08\u4e3a\u4e86\u6574\u7406\u6ce8\u91ca\uff09\uff0c\u4e8e\u662f\u5c31\u51fa\u73b0\u95ee\u9898\u4e86\uff0c\u4e0d\u77e5\u9053\u5982\u4f55\u5b9e\u73b0\u2026\u2026\u4e3e\u4e2a\u5b9e\u4f8b\u5982\u4e0b\uff1a<\/p>\n<p><img decoding=\"async\" loading=\"lazy\" src=\"http:\/\/www.whitetrefoil.com\/blog\/wp-content\/uploads\/2011\/11\/hg01.png\" alt=\"thg-glog01\" title=\"hg01\" width=\"308\" height=\"104\" class=\"alignnone size-full wp-image-344\" \/><\/p>\n<p>\u73b0\u5728\u60f3\u8981\u5c06dev\u5206\u652f\u7684\u6700\u65e7\u8282\u70b92\u7ed9\u632a\u5230\u4e3b\u5206\u652f\u4e0a\u53bb\uff0c\u4fdd\u75593\u30014\u4e0d\u52a8\uff0c\u56e0\u4e3a2\u662f\u4e00\u4e2a\u6709\u610f\u4e49\u7684\u3001\u5b8c\u6574\u7684\u63d0\u4ea4\uff0c\u800c\u4e4b\u540e\u76843\u30014\u5219\u662f\u672a\u5b8c\u6210\u7684\u3001\u65e0\u610f\u4e49\u7684\u63d0\u4ea4\uff0c\u9700\u8981\u4ee5\u540e\u7528rebase &#8211;collapse\u6765\u5408\u5e76\uff0c\u4e5f\u5c31\u662f\u60f3\u8981\u5982\u4e0b\u6548\u679c\uff1a<\/p>\n<p><img decoding=\"async\" loading=\"lazy\" src=\"http:\/\/www.whitetrefoil.com\/blog\/wp-content\/uploads\/2011\/11\/hg04.png\" alt=\"thg-glog04\" title=\"hg04\" width=\"303\" height=\"96\" class=\"alignnone size-full wp-image-347\" \/><\/p>\n<p>\u627e\u73b0\u6210\u547d\u4ee4\uff0c\u5931\u8d25\u2026\u2026\u4e8e\u662f\u6539\u4e3a\u7814\u7a76\u7ed5\u8def\u8d70\uff0c\u6700\u540e\u7528\u5982\u4e0b\u65b9\u6cd5\u6298\u817e\u51fa\u4e86\u7ed3\u679c\uff1a<\/p>\n<p>1\u3001\u9996\u5148\u7b2c\u4e00\u6b21rebase\u628a\u6574\u4e2adev\u5206\u652f\u632a\u5230default\u7684\u5934\u4e0a\u53bb\uff0c\u52a0\u4e86&#8211;keep\u53c2\u6570\u6765\u4fdd\u7559dev\u5206\u652f\u672c\u8eab\u4e0d\u5728rebase\u540e\u88ab\u5220\u9664\uff08\u4e5f\u5c31\u662f\u8bf4\u672c\u8d28\u4e0a\u662f\u628adev\u5206\u652f\u590d\u5236\u4e86\u4e00\u4efd\u5230default\u4e0a\uff09\uff1a<\/p>\n<p><code>hg rebase -s 2 -d default --keep<\/code><\/p>\n<p><img decoding=\"async\" loading=\"lazy\" src=\"http:\/\/www.whitetrefoil.com\/blog\/wp-content\/uploads\/2011\/11\/hg02.png\" alt=\"thg-glog02\" title=\"hg02\" width=\"303\" height=\"157\" class=\"alignnone size-full wp-image-346\" \/><\/p>\n<p>2\u3001\u7b2c\u4e8c\u6b21rebase\uff0c\u628a\u8981\u4fdd\u7559\u7684\u7248\u672c3-4\u201c\u590d\u5236\u201d\u5230\u7248\u672c5\u4e0a\uff08\u7248\u672c5\u5bf9\u5e94\u7684\u662f\u7248\u672c2\uff09\uff0c\u8fd9\u6b21\u52a0\u4e86&#8211;keepbranch\u8ba9\u65b0\u590d\u5236\u51fa\u6765\u7684\u7248\u672c\u4e5f\u5c5e\u4e8edev\u5206\u652f\uff08\u4e0d\u52a0\u7684\u8bdd\u5c31\u662fdefault\u4e86\uff0c\u5982\u4e0a\u4e00\u6761\uff09\uff0c\u52a0\u4e0a&#8211;detach\u6765\u628a\u7248\u672c3-4\u4ece\u7248\u672c2\u4e0a\u5265\u79bb\u4e0b\u6765\uff0c\u907f\u514d\u5e26\u8fc7\u6765\u4e0d\u60f3\u8981\u7684merge\u4fe1\u606f\uff1a<\/p>\n<p><code>hg rebase -s 3:4 -d 5 --keepbranch --detach<\/code><\/p>\n<p><img decoding=\"async\" loading=\"lazy\" src=\"http:\/\/www.whitetrefoil.com\/blog\/wp-content\/uploads\/2011\/11\/hg03.png\" alt=\"thg-glog03\" title=\"hg03\" width=\"288\" height=\"162\" class=\"alignnone size-full wp-image-348\" \/><\/p>\n<p>3\u3001\u5230\u6b64\u4e3a\u6b62\uff0c\u6211\u60f3\u8981\u770b\u5230\u7684\u90a3\u6761\u5386\u53f2\u6811\u5df2\u7ecf\u6709\u4e86\uff0c\u53ea\u4e0d\u8fc7\u5b83\u8fd8\u85cf\u5728\u4e00\u5806\u5176\u4ed6\u7684\u5783\u573e\u7248\u672c\u4e2d\uff0c\u662f\u65f6\u5019\u780d\u6389\u4ed6\u4eec\u4e86\uff0c\u4f7f\u7528\u6740\u624b\u950fstrip\u5e72\u6389\u591a\u4f59\u7684\u7248\u672c2\u30014\u30015\uff1a<\/p>\n<p><strong>\u8fd9\u91cc\u6ce8\u610f\u5982\u679c\u5148strip\u6389\u4e862\uff0c\u90a3\u4e484\u30015\u5c31\u4f1a\u81ea\u52a8\u9012\u51cf\u4e3a3\u30014\uff0c\u968f\u540e\u9700\u8981strip\u7684\u5c31\u662f3\u30014\u800c\u4e0d\u662f4\u30015\u4e86\u3002\u5982\u679c\u5148strip\u6389\u4e864\u30015\uff0c\u90a3\u63a5\u4e0b\u53bb\u8fd8\u662fstrip 2 \u4e0d\u53d7\u5f71\u54cd\u3002<\/strong><\/p>\n<p><img decoding=\"async\" loading=\"lazy\" src=\"http:\/\/www.whitetrefoil.com\/blog\/wp-content\/uploads\/2011\/11\/hg04.png\" alt=\"thg-glog04\" title=\"hg04\" width=\"303\" height=\"96\" class=\"alignnone size-full wp-image-347\" \/><\/p>\n<p>\u8fd9\u6837\u7684\u505a\u6cd5\u5176\u5b9e\u771f\u7684\u662f\u975e\u5e38\u9ebb\u70e6\u7684\uff0c\u5982\u679c\u90a3\u4f4d\u9ad8\u4eba\u77e5\u9053\u4ec0\u4e48\u6377\u5f84\uff0c\u70e6\u8bf7\u6307\u70b9\u4e00\u4e0b\u554a\u3002<\/p>\n<p><strong>\u53e6\uff0crebase\u3001strip\u4e4b\u7c7b\u4e00\u822c\u53ea\u80fd\u7528\u6765\u6e05\u7406\u81ea\u5df1\u7684\u5783\u573e\u6570\u636e\uff0c\u53ef\u5343\u4e07\u522b\u5bf9\u7740\u6218\u53cb\u4eec\u7684\u52b3\u52a8\u6210\u679c\u624b\u8d77\u5200\u843d\u554a\u2026\u2026<\/strong><\/p>\n","protected":false},"excerpt":{"rendered":"<p>\u6700\u8fd1\u521a\u521a\u5f00\u59cb\u5b66\u4e60git\u548chg\uff0c\u5bf9\u4e8egit\u7684\u5386\u53f2\u4fee\u8ba2\u529f\u80fd\u7231\u4e0d\u91ca\u624b\uff0c\u4f46\u662f\u5728hg\u4e0b\u60f3\u8981\u5982\u6b64\u5077\u5929\u6362\u65e5\u5c31\u6ca1\u90a3\u4e48\u65b9\u4fbf\u4e86\u3002\u5e78\u597d\u73b0\u5728\u6709\u4e86\u8bf8\u5982rebase\u3001mq\u7b49\u6269\u5c55\uff0c\u4e8b\u60c5\u53d8\u5f97\u5bb9\u6613\u4e86\u8bb8\u591a\u3002<\/p>\n<p>\u4e8b\u5b9e\u4e0a\u56fd\u5185\u7684hg\u5b66\u4e60\u8d44\u6599\u5f88\u5c11\uff0c\u672c\u4eba\u82f1\u6587\u6c34\u5e73\u5f88\u6b8b\uff0c\u4eca\u5929\u60f3\u5b9e\u73b0\u4e00\u4e2a\u529f\u80fd\uff0cGoogle\u534a\u5929\u5374\u65e0\u89e3\uff0c\u53ea\u597d\u81ea\u5df1\u60f3\u4e86\u4e2a\u6b6a\u95e8\u90aa\u9053\u7684\u529e\u6cd5\u7ed5\u8def\u5b9e\u73b0\uff0c\u603b\u89c9\u5f97hg\u5e94\u8be5\u6709\u5185\u7f6e\u4ec0\u4e48\u65b9\u6cd5\u53ef\u4ee5\u76f4\u63a5\u5b9e\u73b0\uff0c\u82e6\u4e8e\u4e0d\u8ba4\u8bc6\u4efb\u4f55VCS\u7684\u8fbe\u4eba\uff0c\u65e0\u5904\u6c42\u6559\u554a\u3002<\/p>\n<p>\u5b9e\u9645\u60c5\u51b5\u662f\u8fd9\u6837\u7684\uff0c\u56e0\u4e3a\u6211\u4f9d\u65e7\u559c\u7231\u4f7f\u7528branch\u800c\u4e0d\u662fbookmark\u6216\u8005mq\u6765\u5b9e\u73b0\u672c\u5730\u7684\u5f00\u53d1\u5206\u652f\uff0c\u7136\u540e\u5f53\u628adev\u5206\u652frebase\u5230\u4e3b\u5206\u652f\u65f6\uff0c\u6211\u5e0c\u671b\u5206\u6bb5\u9010\u6b65rebase\uff0c\u800c\u4e0d\u662f\u4e00\u80a1\u8111\u5168rebase\u8fc7\u53bb\uff08\u4e3a\u4e86\u6574\u7406\u6ce8\u91ca\uff09\uff0c\u4e8e\u662f\u5c31\u51fa\u73b0\u95ee\u9898\u4e86\uff0c\u4e0d\u77e5\u9053\u5982\u4f55\u5b9e\u73b0\u2026\u2026<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[8],"tags":[24,34,37,41,53,65,85,116,212],"_links":{"self":[{"href":"https:\/\/www.whitetrefoil.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/339"}],"collection":[{"href":"https:\/\/www.whitetrefoil.com\/blog\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.whitetrefoil.com\/blog\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.whitetrefoil.com\/blog\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.whitetrefoil.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=339"}],"version-history":[{"count":0,"href":"https:\/\/www.whitetrefoil.com\/blog\/index.php?rest_route=\/wp\/v2\/posts\/339\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.whitetrefoil.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=339"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.whitetrefoil.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=339"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.whitetrefoil.com\/blog\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=339"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}