TortoiseHG+hgsubversionã§ã®svnã®branchã®merge - monjudoh’s diary概略 hgsubversionã§ã¯hg mergeã—ã¦ã§ããŸmerge済ã¿revisionã‚’pushã™ã‚‹ã“ã¨ã¯ã§ããªã„。 hg mergeã—ãŸã‚‰ mergeå‰revisionã«hg update merge済ã¿revisionã§revert hg commit ã¨ã‚„ã£ã¦åŒå†…容ã®éžmerge revisionを作ã£ã¦ãれをpushã™ã‚Œã°è‰¯ã„。 ã›ã¤ã‚ー 黄色ã®branchã‹ã‚‰é»’ã®defaultã«mergeã™ã‚‹ã¨ã™ã‚‹ã€‚ ã¾ãšã€TortoiseHGã§æ™®é€šã«mergeã™ã‚‹ã€‚ 確èªãƒ€ã‚¤ã‚¢ãƒã‚°ã§local:default,other:branchã¨ãªã£ã¦ã„るよã†ã«ã™ã‚‹ã“㨠merge直後ã®çŠ¶æ…‹ã¯ã“ã®ã‚ˆã†ã«ãªã‚‹ã€‚ hgsubversionã§ã¯hg mergeã—ã¦ã§ããŸmerge revisionã‚’pushã™ã‚‹ã“ã¨ã¯ã§ããªã„ã®ã§ã€ defaultã®mergeç›´å‰revisionã«hg updateã—〠m
TortoiseHG 0.9.0ã®incoming,pull/outgoing,push - monjudoh’s diary
{{#tags}}- {{label}}
{{/tags}}