[B! git-svn] monjudohã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯

monjudoh id:monjudoh

git-svnã«é–¢ã™ã‚‹monjudohã®ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯ (7)

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

${{author_name}}$
{{author_name}}{{created}}
{{ #comment }}{{ comment }}{{ /comment }}
- {{ label }}

${{author_name}}$

{{{comment_expanded}}}

{{label}}

{{#is_bookmark}}ãƒªã‚¹ãƒˆ{{/is_bookmark}}{{^is_bookmark}}ãƒªãƒ³ã‚¯{{/is_bookmark}}

Better Subversionã¨ã—ã¦ã®git-svn
æ™®æ®µã®ãƒ—ãƒã‚°ãƒ©ãƒŸãƒ³ã‚°ã«gitã‚’ä½¿ç”¨ã—ã¦ã„ã‚‹ã®ã ã‘ã©ã€å®Ÿéš›ã®ç¾å ´ã§ã¯ã¾ã ã¾ã svnãŒä¸»æµã ã£ãŸã‚Šã™ã‚‹ã€‚svnã‚’ç›´æŽ¥ä½¿ã£ã¦ã‚‚ã„ã„ã®ã ã‘ã©ã€ã‚„ã¯ã‚Šãƒãƒ¼ã‚«ãƒ«ä¸Šã§ã‚³ãƒŸãƒƒãƒˆã—ãŸã„ã¨ã‹ã€è¤‡æ•°ã®ã‚³ãƒŸãƒƒãƒˆã‚’1ã¤ã«ã¾ã¨ã‚ãŸã„ã¨ã‹ã€ãƒˆãƒ”ãƒƒã‚¯ãƒ–ãƒ©ãƒ³ãƒã‚’åˆ‡ã‚ŠãŸã„ã¨ã‹ã‚ã‚‹ã®ã§ãã‚Œã¯svnå˜ä½“ã ã¨åŽ³ã—ã„ã€‚ãã‚“ãªã‚ã‘ã§Better SVNã¨ã—ã¦ã®git svnã®ç´¹ä»‹ã€ã¨è¨€ã†ã‚ˆã‚Šãƒ¡ãƒ¢ã€‚ ãƒªãƒã‚¸ãƒˆãƒªã®ã‚¯ãƒãƒ¼ãƒ³ git svn clone repository_url ã“ã‚Œã§svnãƒªãƒã‚¸ãƒˆãƒªã‚’gitãƒªãƒã‚¸ãƒˆãƒªã¨ã—ã¦å–å¾—ã§ãã‚‹ã€‚å¤§ãã‚ã®ãƒªãƒã‚¸ãƒˆãƒªã ã¨çµæ§‹æ™‚é–“ãŒã‹ã‹ã‚‹ã®ã§ã®ã‚“ã³ã‚Šã¨ã€‚svnãƒªãƒã‚¸ãƒˆãƒªã®æ§‹æˆãŒtrunk/branches/tagsã¨ã„ã†ä¸€èˆ¬çš„ãªæ§‹æˆã§ã‚ã‚Œã°ã‚ªãƒ—ã‚·ãƒ§ãƒ³-ã‚’ä»˜ã‘ã‚‹ã®ãŒãŠã™ã™ã‚ã€‚trunkã‚’masterã€branches/tagsã‚’remote branchã¨ã—ã¦æ‰±ã†ã‚ˆã†ã«ãªã‚‹ã€‚å€‹åˆ¥ã«æŒ‡å®šã™ã‚‹æ–¹æ³•ã‚‚ã‚ã‚‹ã®ã§
monjudoh 2010/09/13
ã“ã‚Œã ã‘åˆ†ã‹ã£ã¦ã‚Œã°ã¯ã¾ã‚‰ãšã«git-svnã‚’æ‰±ãˆã‚‹ã®ã ã‚ã†ã‹?

svn

git-svn

Git
ãƒªãƒ³ã‚¯
git-svnã§ãƒªãƒ¢ãƒ¼ãƒˆãƒ–ãƒ©ãƒ³ãƒã‚’mergeã™ã‚‹ã¨ãã¯â€“no-ffã‚’ã¤ã‘ã‚‹ã¹ã— - Webtech Walker
git-svnã§ãƒªãƒ¢ãƒ¼ãƒˆãƒ–ãƒ©ãƒ³ãƒã‚’ãã£ã¦ä½œæ¥ã—ã¦ã¦trunkã«mergeã—ã‚ˆã†ã¨æ€ã£ãŸã‚‰ã€mergeã—ãŸå…ˆã®ãƒãƒ¼ã‚«ãƒ«ãƒ–ãƒ©ãƒ³ãƒã®å‘ãå…ˆãŒãƒªãƒ¢ãƒ¼ãƒˆãƒ–ãƒ©ãƒ³ãƒã«ãªã‚‹ç¾è±¡ã§ã¯ã¾ã£ãŸã€‚ã¾ãŸã—ã¦ã‚‚typester++ã§ã‚ã‚Šã¾ã™ã€‚ã‚¤ãƒ³ã‚¯ãƒªãƒ¡ãƒ³ãƒˆã•ã‚Œã™ãŽã¦ãã‚ãã‚2147483647è¶…ãˆã‚‹ã‚“ã˜ã‚ƒãªã„ã¨å¿ƒé…ã§ã™ã€‚ # ä»Šmasterãƒ–ãƒ©ãƒ³ãƒã«ã„ã‚‹ $ git branch * master # ãƒªãƒ¢ãƒ¼ãƒˆãƒ–ãƒ©ãƒ³ãƒã¯trunkã‚’è¦‹ã¦ã‚‹ $ git svn info URL: http://path/to/trunk ... # ãƒªãƒ¢ãƒ¼ãƒˆãƒ–ãƒ©ãƒ³ãƒtopicã‚’ä½œæˆã—ã¦ãƒãƒ¼ã‚«ãƒ«ãƒ–ãƒ©ãƒ³ãƒtopic_localã«ã‚³ãƒ”ãƒ¼ $ git svn branch topic $ git checkout -b topic_local topic # ãƒãƒ¼ã‚«ãƒ«ãƒ–ãƒ©ãƒ³ãƒã¯topic_local $ git branch master *
monjudoh 2010/08/24
ã€Žmergeã™ã‚‹ã¨ãã«fast-forwardã—ã¦ã—ã¾ã†ã¨git-svnã¯ã†ã¾ãã„ã‹ãªã„ã‚‰ã—ã„ã€

Git

svn

git-svn
ãƒªãƒ³ã‚¯
git-svnã®ä½¿ã„æ–¹ã‚’è¦šãˆãŸ - idesaku blog
åˆ†æ•£SCMã‚’ä½¿ã„ãŸã„ï¼ã¨æ€ã†ä»Šæ—¥ã“ã®é ƒã€‚ ä»•äº‹ã§ã¯SVNï¼ˆSubversionï¼‰ã‚’ä½¿ã£ã¦ã„ã‚‹ã®ã ãŒã€ã¡ã‚‡ã£ã¨ã—ãŸãŠè©¦ã—ç·¨é›†ã‚’ã™ã‚‹ãŸã‚ã«ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œã‚‹ã“ã¨ã«æŠµæŠ—ãŒã‚ã‚‹ã€‚ãƒ–ãƒ©ãƒ³ãƒã¯æ¬²ã—ã„ã€å¤§ãã‚ãªå¤‰æ›´ã‚’ã‚³ãƒŸãƒƒãƒˆç„¡ã—ã§è¡Œã„ãŸããªã„ã€ã‚„ã¯ã‚Šå°‘ã—ãšã¤ã‚³ãƒŸãƒƒãƒˆã—ã¦é€²ã‚ã¦ã„ããŸã„ã€‚ã—ã‹ã—ã€å¤‰æ›´ãŒå…¨ã¦è¨˜éŒ²ã•ã‚Œã¦ã—ã¾ã†ã®ãŒã„ãŸã ã‘ãªã„ã€‚ãƒã‚°ãŒæ®‹ã‚‹ã®ã¯è‰¯ã„ã“ã¨ãªã®ã ãŒã€æœ¬å½“ã«ä½¿ã†ã‹ã©ã†ã‹æœªçŸ¥æ•°ãªå®Ÿé¨“çš„ãƒ—ãƒã‚°ãƒ©ãƒŸãƒ³ã‚°ã®ãƒã‚°ã¾ã§æ®‹ã—ãŸããªã„ã€‚ä½¿ã†ã¨æ±ºã¾ã£ã¦ã‹ã‚‰åˆã‚ã¦æ®‹ã™ã‚ˆã†ã«ã—ãŸã„ã®ã ã€‚ ã™ã¾ã‚“ã€ã“ã‚Œã¾ã§ä¸€ç·’ã«ä»•äº‹ã‚’ã—ã¦ããŸäººã€…ã‚ˆã€‚ä¿ºã¯ã“ã‚Œã¾ã§ã€Œãƒã‚°ãŒæ®‹ã£ã¦å›°ã‚‹ã“ã¨ãŒãªã‚“ã‹ã‚ã‚‹ï¼Ÿã„ã‚‰ãªãã‚ƒç„¡è¦–ã™ã‚Œã°ã„ã„ã ã‘ãªã‚“ã ã‹ã‚‰ã€æ°—ã«ã™ã‚‹ãªã€‚ãƒ–ãƒ©ãƒ³ãƒã§ã‚‚ãªã‚“ã§ã‚‚ãƒãƒ³ãƒãƒ³ä½œã£ã¦ã—ã¾ãˆï¼ã€ã¨ã†ãã¶ã„ã¦ãã¦ã„ã‚‹ã‚ã‘ã ãŒâ€¦ãƒãƒƒã‚¿ãƒªã‹ã¾ã—ã¦ã¾ã—ãŸï¼æœ¬å½“ã¯ä¿ºã‚‚æŠµæŠ—ãŒã‚ã‚‹ã®ã ã€‚ ãã“ã§ã€åˆ†æ•£SCMã ã€‚ã•ã‚‰ã«ã„ã†ã¨ã€SVKãŒã„ã¾ã²ã¨ã¤æ°—ã«å…¥
monjudoh 2010/08/11
ã€ŽSVNå´ã®ãƒ–ãƒ©ãƒ³ãƒã‚’åæ˜ ã•ã›ãŸãƒãƒ¼ã‚«ãƒ«ãƒ–ãƒ©ãƒ³ãƒã‚’ä½œæˆã—ãŸå ´åˆã€ãã„ã¤ã¨gitå´ã§è‡ªåˆ†ãŒä½œã£ãŸãƒãƒ¼ã‚«ãƒ«ãƒ–ãƒ©ãƒ³ãƒã¨ã‚’ç°¡å˜ã«è¦‹åˆ†ã‘ã‚‹æ–¹æ³•ãŒç„¡ã„ã®ãŒå•é¡Œã€‚ãƒãƒ¼ãƒŸãƒ³ã‚°ãƒ«ãƒ¼ãƒ«ã‚’ä½œã‚Œã°ã„ã„ã‹ã€‚ã€

Git

svn

git-svn

ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«
ãƒªãƒ³ã‚¯
ã‚¦ãƒŽã‚¦ãƒ©ãƒœ Unoh Labs: git-svné§†ã‘è¾¼ã¿å¯º
ã“ã‚“ã«ã¡ã¯ã€‚murahashiã§ã™ã€‚ gitã‚„git-svnã‚’ä½¿ã†ã«ã‚ãŸã‚Šã€è©¦ã—ãŸã“ã¨ã‚„å¼•ã£ã‹ã‹ã£ãŸã“ã¨ã«ã¤ã„ã¦ã€yukiã®ã‚¨ãƒ³ãƒˆãƒª ã‚¦ãƒŽã‚¦ãƒ©ãƒœ Unoh Labs: subversionãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚gitãŒä½¿ãˆã‚‹git-svn ã®ã¤ã¥ãã‚’æ›¸ã„ã¦ã¿ã¾ã—ãŸã€‚ Q. ãƒ–ãƒ©ãƒ³ãƒåã‚’é•·ãã—ã¦ã—ã¾ã£ãŸã®ã§æ‰‹æ‰“ã¡ã™ã‚‹ã®ãŒå¤§å¤‰ã§ã™ A. bashã§gitã‚³ãƒžãƒ³ãƒ‰ã‚’è£œå®Œã—ã¾ã™ gitã®ã‚³ãƒžãƒ³ãƒ‰è£œå®Œã¯ git-completion.bash ãŒä¾¿åˆ©ã§ã™ã€‚ fedoraã«yumã§gitã‚’å…¥ã‚ŒãŸå ´åˆã«ã¯ä¸‹è¨˜å ´æ‰€ã«ã‚ã‚Šã¾ã™ã€‚ /usr/share/doc/git-VERSION/cntrib/completion/ è‡ªåˆ†ã®è¦‹ãˆã‚‹å ´æ‰€ã«git-completion.bashãŒãªã‘ã‚Œã°ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«æ¸ˆã¿ã®gitã¨åŒã˜versionã®gitã®ã‚½ãƒ¼ã‚¹ã‚’ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã™ã€‚ cntrib/completion/
monjudoh 2010/05/22
Git

git-svn

tips
ãƒªãƒ³ã‚¯
git-svnã«ã‚ˆã‚‹å®Ÿãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§ã®ãƒãƒ¼ãƒ é–‹ç™º
ã“ã‚“ã«ã¡ã¯ã€SHIMADAã§ã™ã€‚Gitãƒã‚¿ã¯ãŸã‚ã¡ã‚ƒã‚“ã«å…ˆã‚’è¶Šã•ã‚Œã¦ã—ã¾ã„ã¾ã—ãŸãŒã€è‡ªåˆ†ã®ç’°å¢ƒã§ã‚‚ã€å®Ÿéš›ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã§Gitã‚’å®Ÿç”¨çš„ã«ä½¿ãˆã‚‹çŠ¶æ³ã«ãªã£ã¦ããŸã®ã§ã€ãã®ã¸ã‚“ã«ã¤ã„ã¦æ›¸ã“ã†ã¨æ€ã„ã¾ã™ã€‚ â– å‰æ å‰ææ¡ä»¶ã¨ã—ã¦ã€ 1. ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã®ãŸã‚ã®svnãƒªãƒã‚¸ãƒˆãƒªãŒã‚µãƒ¼ãƒãƒ¼ã«ç”¨æ„ã•ã‚Œã¦ã„ã‚‹ã“ã¨ 2. ãƒªãƒã‚¸ãƒˆãƒªãŒ PROJECT_NAME/ `- trunk/ `- branches/ `- tags/ ã¨ã„ã†Subversionã®æ¨™æº–çš„ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæ§‹æˆã¨ãªã£ã¦ã„ã‚‹ã“ã¨ 3. ãƒãƒ¼ã‚«ãƒ«ã«æœ€æ–°ã®gitãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã‚‹ã“ã¨ ãŒæ¡ä»¶ã¨ãªã‚Šã¾ã™ã€‚ å‰è€…ãŒæƒã£ã¦ã„ãªã„ã¨ã„ã†äººã¯ã€ã¾ãšSubversionã‚’å°Žå…¥ã§ãã‚‹ã‚ˆã†ã«ç¤¾å†…ã§ã®æŽ¨é€²ã‚’ãŒã‚“ã°ã£ã¦ãã ã•ã„ã€‚ ç”³è«‹æ›¸ã¨USBãƒ¡ãƒ¢ãƒªãŒãªã„ã¨ã‚³ãƒŸãƒƒãƒˆã§ããªã„ã‚“ã ã‚ˆâ€¦â€¦ã€ã¨ã„ã†äººã¯ã€æ®‹å¿µãªãŒã‚‰ã‚ãã‚‰ã‚ã¦ãã ã•ã„ã€‚ ï¼ˆã‚ã‚Œã¯ãƒã‚¿ã ã¨ä¿¡ã˜ã¦ã„ã¾ã™ãŒ
monjudoh 2010/04/24
Git

svn

git-svn
ãƒªãƒ³ã‚¯
git svn rebase ã§ conflict ã—ãŸã¨ãã®è§£æ¶ˆæ‰‹é † - æ—¥æ›œãƒ—ãƒã‚°ãƒ©ãƒžãŒãƒ€ãƒ©ãƒ€ãƒ©æ›¸ã
ãƒ¡ãƒ¢ã€‚ $ git svn rebaseã—ãŸã¨ãã«ã€è‡ªå‹•çš„ã«ãƒžãƒ¼ã‚¸ã§ããšã€ CONFLICT (content): Merge conflict in path/to/conflicted_fileWhen you have resolved this probl em run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/trunk: command returned error: 1 ã“ã‚“ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå‡ºãŸã¨ãã®è§£æ¶ˆæ‰‹é †ã€‚ status ã‚’ç¢ºèªã™ã‚‹ã¨ã“ã‚“
monjudoh 2010/04/20
Git

tips

git-svn
ãƒªãƒ³ã‚¯
Subversionã®ãƒªãƒã‚¸ãƒˆãƒªä¸‹ã§gitã‚’ä½¿ã£ã¦ã¿ã‚ˆã†
ã“ã‚“ã«ã¡ã¯ã€ç†Šè°·ã§ã™ã€‚ ä»Šã¾ã§é•·ã„é–“ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã¨ã—ã¦Subversionã‚’ä½¿ã£ã¦ã„ã¾ã—ãŸã€‚ç‰¹ã«ä¸æº€ã‚‚ãªãä½¿ã„æ…£ã‚Œã¦ã„ã‚‹ã‚·ã‚¹ãƒ†ãƒ ãªã®ã§ãšã£ã¨ä½¿ã£ã¦ã„ãŸã®ã§ã™ãŒã€ã‚ã‚‹ã¨ãã€ã“ã†ã„ã†ç’°å¢ƒã§Subversionã‚’ä½¿ã†ã®ã¯ã¡ã‚‡ã£ã¨ä¸ä¾¿ã‹ã‚‚ã—ã‚Œãªã„ã¨ã„ã†çŠ¶æ³ãŒç”Ÿã¾ã‚Œã€ã„ã‚ã„ã‚è€ƒãˆèª¿ã¹ã¦ã¿ãŸçµæžœã€gitãŒä½¿ãˆã‚‹ã®ã§ã¯ãªã„ã‹ã¨ã„ã†çµè«–ã«é”ã—ã¾ã—ã¦ã€æ—©é€Ÿä½¿ã£ã¦ã¿ã¾ã—ãŸã€‚ ãã‚‚ãã‚‚Subversionã¨gitã®é•ã„ã¯ä½•ãªã®ã‹ã€‚Subversionã¯é›†ä¸åž‹ã€gitã¯åˆ†æ•£åž‹ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†ã‚·ã‚¹ãƒ†ãƒ ã§ã€Subversionã¯ä¸å¤®ã®ãƒªãƒã‚¸ãƒˆãƒªã«å¯¾ã—ã¦ã‚³ãƒŸãƒƒãƒˆã‚’è¡Œã£ã¦ã„ãã®ã§ã™ãŒã€gitã¯å„ãƒ¦ãƒ¼ã‚¶ãŒæŒã¤ãƒãƒ¼ã‚«ãƒ«ã®ãƒªãƒã‚¸ãƒˆãƒªã«å¯¾ã—ã¦è¡Œã„ã¾ã™ã€‚ãã—ã¦ã€ãƒãƒ¼ã‚«ãƒ«ã®ãƒªãƒã‚¸ãƒˆãƒªã®å†…å®¹ã‚’ä¸å¤®ã®ãƒªãƒã‚¸ãƒˆãƒªã«åæ˜ ã—ãŸã‚Šã€åˆ¥ã®ãƒ¦ãƒ¼ã‚¶ãŒæŒã¤ãƒªãƒã‚¸ãƒˆãƒªã‚’å–å¾—ã—ãŸã‚Šåæ˜ ã—ãŸã‚Šã¨ã„ã£ãŸã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚ ã¾ãŸã€æ—¢ã«Subversion
monjudoh 2010/03/25
Git

svn

git-svn
ãƒªãƒ³ã‚¯
1