{"id":1398,"date":"2012-01-12T12:18:40","date_gmt":"2012-01-12T03:18:40","guid":{"rendered":"http:\/\/www.lancard.com\/blog\/?p=1398"},"modified":"2025-03-12T11:30:35","modified_gmt":"2025-03-12T02:30:35","slug":"%e3%81%93%e3%82%8c%e3%81%a0%e3%81%91%e3%81%a7%e4%b8%80%e5%bf%9c%e4%bd%bf%e3%81%88%e3%82%8b-git-svn-%e5%85%a5%e9%96%80","status":"publish","type":"post","link":"https:\/\/www.lancard.com\/blog\/2012\/01\/12\/%e3%81%93%e3%82%8c%e3%81%a0%e3%81%91%e3%81%a7%e4%b8%80%e5%bf%9c%e4%bd%bf%e3%81%88%e3%82%8b-git-svn-%e5%85%a5%e9%96%80\/","title":{"rendered":"\u3053\u308c\u3060\u3051\u3067\u4e00\u5fdc\u4f7f\u3048\u308b git-svn \u5165\u9580"},"content":{"rendered":"<p>\u3084\u3041\u3084\u3041\u3001\u6751\u90e8\u3067\u3059\u3002<\/p>\n<p>\u5206\u6563\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u306fBazaar\u3092\u305a\u3063\u3068\u4f7f\u3063\u3066\u3044\u307e\u3057\u305f\u304c\u3001\u4e16\u306e\u6d41\u308c\u306b\u306f\u9006\u3089\u3048\u305a\u73fe\u5728\u3084\u3063\u3066\u3044\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306fGit\u3092\u4f7f\u3046\u3053\u3068\u306b\u3057\u307e\u3057\u305f\u3002<\/p>\n<p>\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3092\u7ba1\u7406\u3059\u308b\u306e\u3067\u3042\u308c\u3070Git\u306f\u5f37\u529b\u3067\u3059\u3057\u306d\u3002Eclipse\u3067\u3082Netbeans\u3067\u3082\u4f7f\u3048\u308b\u306e\u3082\u9b45\u529b\u3002<\/p>\n<p>\u305f\u3060\u3057\u3001\u4e2d\u592e\u30ea\u30dd\u30b8\u30c8\u30ea\u306fSubversion\u3067\u3059\u3002\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u3082\u540c\u3058\u30ea\u30dd\u30b8\u30c8\u30ea\u7ba1\u7406\u3057\u305f\u3044\u306e\u3067Subversion\u304c\u4fbf\u5229\u306a\u306e\u3067\u3059\u3002<\/p>\n<p>\u65e2\u306b\u793e\u5185\u3067git-svn\u3067\u306e\u904b\u7528\u5b9f\u7e3e\u3082\u3042\u308a\u307e\u3059\u306e\u3067\u5b89\u5fc3(Bazaar\u4f7f\u3044\u305f\u3044\u6642\u306fbzr-svn\u3067\u3084\u308c\u307e\u3059\u3057\u306d)\u3002<\/p>\n<p>\u793e\u5185Git\u6d3e\u95a5\u306e\u65b9\u306b\u805e\u3044\u305f\u6240\u300c\u57fa\u672ctrunk\u3067\u3084\u308b\u306a\u3089\u4e0b\u8a18\u899a\u3048\u3066\u304a\u3051\u3070OK\u300d\u3068\u306e\u3053\u3068\u3002<\/p>\n<pre lang=\"bash\">\r\n## \u30ed\u30fc\u30ab\u30eb\u3067\u306e\u30b3\u30df\u30c3\u30c8\r\ngit add .\r\ngit commit\r\n\r\n## SVN\u3078\u306e\u30b3\u30df\u30c3\u30c8\r\ngit svn rebase  #\u4e00\u65e6SVN\u306e\u30ea\u30dd\u30b8\u30c8\u30ea\u304b\u3089\u53d6\u308a\u8fbc\u307f\r\ngit svn dcommit #\u30ed\u30fc\u30ab\u30eb\u306e\u5909\u66f4\u3092\u53cd\u6620\r\n<\/pre>\n<p>\u3057\u3070\u3089\u304f\u4f7f\u3063\u3066\u307f\u3066\u4e0d\u4fbf\u306b\u611f\u3058\u305f\u306e\u304c git commit \u76f4\u5f8c\u3067\u306a\u3044\u3068 git svn rebase \u3084 git svn dcommit \u304c\u3067\u304d\u306a\u3044\u3053\u3068\u3002\u3059\u3053\u3057\u3067\u3082\u4fee\u6b63\u3057\u3066\u3044\u308b\u3068\u3060\u3081\u3002\u3000\u30bf\u30fc\u30b9\u30fc\u30b1\u30fc\u30c6\u30fc<\/p>\n<p>\u300cgit stash \u304c\u3042\u308b\u3088\u300d<\/p>\n<p>\u5909\u66f4\u3092\u9000\u907f\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3060\u305d\u3046\u3067\u3059\u3002\u3066\u306a\u308f\u3051\u3067SVN\u3078\u306e\u30b3\u30df\u30c3\u30c8\u306e\u57fa\u672c\u306f\u3053\u3093\u306a\u611f\u3058\u3002<\/p>\n<pre lang=\"bash\">\r\ngit stash save -u #commit\u3057\u3066\u306a\u3044\u5909\u66f4\u3092\u9000\u907f\r\ngit svn rebase\r\ngit svn dcommit\r\ngit stash pop #\u9000\u907f\u304b\u3089\u53d6\u308a\u51fa\u3057\r\n<\/pre>\n<p>git stash save \u306e -u \u30aa\u30d7\u30b7\u30e7\u30f3\u306f &#8211;include-untracked \u306e\u7701\u7565\u5f62\u3002add \u3057\u3066\u3044\u306a\u3044\u5909\u66f4\u3082\u9000\u907f\u3057\u307e\u3059\u3002<br \/>\n\u300c\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u3051\u3066\u306a\u3044\u3068\u3088\u304f\u308f\u304b\u3089\u306a\u3044\u30c8\u30e9\u30d6\u30eb\u306b\u306a\u308a\u304c\u3061\u300d\u3060\u305d\u3046\u306a\u306e\u3067\u3064\u3051\u3068\u304d\u307e\u3057\u3087\u3046\u3002<\/p>\n<p>\u4ee5\u4e0a\u3001\u3053\u308c\u3060\u3051\u3067\u4e00\u5fdc\u4f7f\u3048\u308b git-svn \u5165\u9580\u3067\u3057\u305f\u3002<\/p>\n<p>\u203b2012-03-21 \u8ffd\u8a18<br \/>\ngit stash save \u306e -u \u30aa\u30d7\u30b7\u30e7\u30f3\u306b\u3064\u3044\u3066\u3067\u3059\u304c\u3001\u65b0\u3057\u3044\u30d5\u30a1\u30a4\u30eb\u3092\u4f5c\u6210\u3001\u7de8\u96c6\u3057\u3066\u308b\u3068\u304d\u306badd\u524d\u306b\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u3064\u3051\u3066 save \u3059\u308b\u3068 pop \u6642\u306b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3059\u308b\u3053\u3068\u304c\u591a\u3044\u3067\u3059\u3002\u305d\u306e\u5834\u5408\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3092\u89e3\u6d88\u3059\u308b\u306b\u306f\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u3066\u3044\u308b\u30d5\u30a1\u30a4\u30eb\u3092\u3059\u3079\u3066\u524a\u9664(\u307e\u305f\u306f\u4ed6\u306e\u5834\u6240\u306b\u79fb\u52d5)\u3057\u3066\u518d\u5ea6 pop \u3057\u307e\u3059\u3002\u6b63\u5e38\u306b pop \u3059\u308b\u524d\u306b git stash drop \u3059\u308b\u3068\u7de8\u96c6\u3057\u3066\u3044\u305f\u30d5\u30a1\u30a4\u30eb\u3092\u5931\u3063\u3066\u6ce3\u304f\u3053\u3068\u306b\u306a\u308b\u306e\u3067\u3054\u6ce8\u610f\u3092\u3002<br \/>\n\u3068\u3044\u3046\u3053\u3068\u3067\u4e00\u6982\u306b -u \u3092\u3064\u3051\u305f\u307b\u3046\u304c\u3044\u3044\u3068\u306f\u8a00\u3048\u306a\u3044\u3088\u3046\u3067\u3059\u3002<\/p>\n<a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-facebook nolightbox\" data-provider=\"facebook\" target=\"_blank\" rel=\"nofollow\" title=\"Share on Facebook\" href=\"https:\/\/www.facebook.com\/sharer.php?u=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F1398&#038;t=%E3%81%93%E3%82%8C%E3%81%A0%E3%81%91%E3%81%A7%E4%B8%80%E5%BF%9C%E4%BD%BF%E3%81%88%E3%82%8B%20git-svn%20%E5%85%A5%E9%96%80&#038;s=100&#038;p&#091;url&#093;=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F1398&#038;p&#091;images&#093;&#091;0&#093;=&#038;p&#091;title&#093;=%E3%81%93%E3%82%8C%E3%81%A0%E3%81%91%E3%81%A7%E4%B8%80%E5%BF%9C%E4%BD%BF%E3%81%88%E3%82%8B%20git-svn%20%E5%85%A5%E9%96%80\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px;margin-right:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"Facebook\" title=\"Share on Facebook\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/facebook.png\" \/><\/a><a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-twitter nolightbox\" data-provider=\"twitter\" target=\"_blank\" rel=\"nofollow\" title=\"Share on Twitter\" href=\"http:\/\/twitter.com\/share?url=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F1398&#038;text=%E3%81%93%E3%82%8C%E3%81%A0%E3%81%91%E3%81%A7%E4%B8%80%E5%BF%9C%E4%BD%BF%E3%81%88%E3%82%8B%20git-svn%20%E5%85%A5%E9%96%80\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px;margin-right:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"twitter\" title=\"Share on Twitter\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/twitter.png\" \/><\/a><a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-linkedin nolightbox\" data-provider=\"linkedin\" target=\"_blank\" rel=\"nofollow\" title=\"Share on Linkedin\" href=\"https:\/\/www.linkedin.com\/shareArticle?mini=true&#038;url=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F1398&#038;title=%E3%81%93%E3%82%8C%E3%81%A0%E3%81%91%E3%81%A7%E4%B8%80%E5%BF%9C%E4%BD%BF%E3%81%88%E3%82%8B%20git-svn%20%E5%85%A5%E9%96%80\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px;margin-right:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"linkedin\" title=\"Share on Linkedin\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/linkedin.png\" \/><\/a><a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-tumblr nolightbox\" data-provider=\"tumblr\" target=\"_blank\" rel=\"nofollow\" title=\"Share on tumblr\" href=\"https:\/\/tumblr.com\/share?s=&#038;v=3&#038;t=%E3%81%93%E3%82%8C%E3%81%A0%E3%81%91%E3%81%A7%E4%B8%80%E5%BF%9C%E4%BD%BF%E3%81%88%E3%82%8B%20git-svn%20%E5%85%A5%E9%96%80&#038;u=https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F1398\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px;margin-right:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"tumblr\" title=\"Share on tumblr\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/tumblr.png\" \/><\/a><a class=\"synved-social-button synved-social-button-share synved-social-size-24 synved-social-resolution-single synved-social-provider-mail nolightbox\" data-provider=\"mail\" rel=\"nofollow\" title=\"Share by email\" href=\"mailto:?subject=%E3%81%93%E3%82%8C%E3%81%A0%E3%81%91%E3%81%A7%E4%B8%80%E5%BF%9C%E4%BD%BF%E3%81%88%E3%82%8B%20git-svn%20%E5%85%A5%E9%96%80&#038;body=%E3%82%B7%E3%82%A7%E3%82%A2%E3%81%99%E3%82%8B%EF%BC%9A:%20https%3A%2F%2Fwww.lancard.com%2Fblog%2Fwp-json%2Fwp%2Fv2%2Fposts%2F1398\" style=\"font-size: 0px;width:24px;height:24px;margin:0;margin-bottom:5px\"><img loading=\"lazy\" decoding=\"async\" alt=\"mail\" title=\"Share by email\" class=\"synved-share-image synved-social-image synved-social-image-share\" width=\"24\" height=\"24\" style=\"display: inline;width:24px;height:24px;margin: 0;padding: 0;border: none;box-shadow: none\" src=\"https:\/\/www.lancard.com\/blog\/wp-content\/plugins\/social-media-feather\/synved-social\/image\/social\/regular\/48x48\/mail.png\" \/><\/a>","protected":false},"excerpt":{"rendered":"<p>\u3084\u3041\u3084\u3041\u3001\u6751\u90e8\u3067\u3059\u3002 \u5206\u6563\u30d0\u30fc\u30b8\u30e7\u30f3\u7ba1\u7406\u306fBazaar\u3092\u305a\u3063\u3068\u4f7f\u3063\u3066\u3044\u307e\u3057\u305f\u304c\u3001\u4e16\u306e\u6d41\u308c\u306b\u306f\u9006\u3089\u3048\u305a\u73fe\u5728\u3084\u3063\u3066\u3044\u308b\u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u3067\u306fGit\u3092\u4f7f\u3046\u3053\u3068\u306b\u3057\u307e\u3057\u305f\u3002 \u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u3092\u7ba1\u7406\u3059\u308b\u306e\u3067\u3042\u308c\u3070Git\u306f\u5f37\u529b\u3067\u3059\u3057\u306d\u3002Ecl [&hellip;]<\/p>\n","protected":false},"author":12,"featured_media":0,"comment_status":"closed","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[1],"tags":[46],"class_list":["post-1398","post","type-post","status-publish","format-standard","hentry","category-1","tag-git"],"_links":{"self":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts\/1398","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/users\/12"}],"replies":[{"embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/comments?post=1398"}],"version-history":[{"count":11,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts\/1398\/revisions"}],"predecessor-version":[{"id":8261,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/posts\/1398\/revisions\/8261"}],"wp:attachment":[{"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/media?parent=1398"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/categories?post=1398"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.lancard.com\/blog\/wp-json\/wp\/v2\/tags?post=1398"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}