ãã¼ã¿ç§»è¡ ############### ãã¼ã¿ç§»è¡ã®æºå ------------------- 移è¡ãéå§ããåã«ãæåã«ãããªãã¹ããã¨ãããã¾ãã 1. å®å ¨ã«ããã¯ã¢ãããã¨ã£ã¦ãã ããã 2. å¤ããã©ã³ããæ¶å»(purge)ããæéãã¨ã£ã¦ãã ããã å®å ¨ãªããã¯ã¢ããã¯ãªã«ãæªããã¨ããããã¨ãã®ã»ã¼ããã£ãããã¨ãªãã¾ãã å¤ããã©ã³ãã®æ¶å»ã¯ç§»è¡å¯¾è±¡ã¨ãªããã¼ã¿ãæ¸ãããã¨ãã§ãã¾ããããããããªãããã®ããã¤ãã®ã³ãã `Finding obsolete branches`_ãã§ã覧ãã ããã 移è¡ã«é¢é£ããã³ãã³ãã®ç´¹ä» ---------------------------------- ãã¼ã¿ç§»è¡æã«ã¯æ³¨æãã¹ã3ã¤ã®éè¦ãªã³ãã³ããããã¾ãã * **check** - ãªãã¸ããªããã©ã³ããããªã¼ã®ãã¼ã¿å®å ¨æ§ã«é¢ããã¨ã©ã¼ã®ãã§ãã¯ã * **reconcile** - ãã¼ã¿å®å ¨æ§ã«é¢ããã¨ã©ã¼ã®ä¿®å¾©ã * **upgrade** - ç°ãªããã¼ã¿ãã©ã¼ãããã¸ã®ç§»è¡ã **reconcile** ã¯ãã£ãã«å¿ è¦ã§ã¯ããã¾ããã **check** ã **upgrade** ã®åå¾ã§è¡ããã¨ã¯è¯ãç¿æ £ã§ãã ãããã®ã³ãã³ãã®è©³ç´°ãªãã«ã㯠`Bazaarã¦ã¼ã¶ã¼ãªãã¡ã¬ã³ã¹`_ ãããããã ããã .. _Bazaarã¦ã¼ã¶ã¼ãªãã¡ã¬ã³ã¹: ../user-reference/index.html ããªãã®ã³ãã¥ããã£ã¨ã®ã³ãã¥ãã±ã¼ã·ã§ã³ --------------------------------------------------------- æ°ãããã©ã¼ãããã¸ã®ã¹ã ã¼ãºãªç§»è¡ãå¯è½ã«ããããã«ã¯ã以ä¸ãå¿ é ã§ã: 1. trunkã®ç§»è¡ãè¡ã責任è ã1人ããããã¨ã 2. trunkã®ç§»è¡è©¦é¨ãæåãããã¨ã 3. trunkã移è¡ããæéã®äºå®ããã¦ããã¨ã¨ãåãã£ã¦ããªãã®ã³ãã¥ããã£ã«ç¥ããã¦ãããã¨ã äºåã«è¦åããã¦ãããã¨ã«ããã³ãã¥ããã£ã«æå±ãã人ã ã 移è¡æ¥ããåã« Bazaarãå¿ è¦ãªpluginã移è¡ããã®ã«ååãªä½è£ãæã¤ãã¨ãã§ããã§ãããã ããã«å¤§ããªã³ãã¥ããã£ã«ããã¦ã¯ã移è¡ããèªèº«ã«è¦ããæéã«é æ ®ãã¾ãããã 試é¨ç§»è¡ã®å¾ã§ã©ã®ããã移è¡ã«æéããããã®ãã«é¢ããè¯ãæ¡ãæã£ã¦ããã¹ãã§ãã移è¡ãé±æ«ãéææ¥ã«è¡ããã¨ã§åé¡ãçºçããã¨ãã«ããªãèªèº«ãä¸æ¯ã¤ããæéãã¨ããã¨ãã§ãããã¨ã¯éçã«ããªã£ã¦ããã§ãããã trunkã移è¡ããããããªãã¯ã³ãã¥ããã£ã«å¯¾ãã¦é©åã«ãç¥ããããå½¼ãã«å½¼ãèªèº«ã®ãã¼ã«ã«ãã©ã³ãã®ç§»è¡èª¬ææ¸ã示ãå¿ è¦ãããã¾ããå¾ã»ã©èª¬ææ¸ã®ä¾ã示ãã¾ãã ã¹ã¿ã³ãã¢ãã³ãã©ã³ãã®ç§»è¡ ------------------------------------ ä½æ¥æé ã¯ä»¥ä¸ã®ã¨ããã§ãã: 1. **bzr check** ãèµ·åãã¾ãã 2. ããã¨ã©ã¼ãçºçãããã**bzr reconcile** ã使ã£ã¦ã¨ã©ã¼ã®ä¿®å¾©ããããã¿ã¦ãã ãããããããã失æãããåé¡ã解決ãã¦ããªãã®trunkãã¯ãªã¼ã³ã«ããããã«ç§ãã¡ããæä¼ãã§ãããããã°ã®å ±åãã ãããããæåãããªãã¯ãªã¼ã³ãªtrunkãªãã¡ã«ããã¯ã¢ãããã¨ã£ã¦ãã ããã 3. **bzr upgrade --format** ãå®è¡ãã¦ãã ããã**format** 㯠2a ã¾ãã¯ãã以éã®ãã¨ã§ãã 4. **bzr check** ãèµ·åãã¦æçµçµæãæ£ãããã©ããã確èªãã¦ãã ããã å ±ç¨ãªãã¸ããªä¸ã®ãã©ã³ããç§»è¡ ----------------------------------------- 移è¡ã¯ä»¥ä¸ã®æé ã§è¡ã£ã¦ãã ãã: 1. å ±ç¨ãªãã¸ããªã®ç§»è¡ã 2. ãã©ã³ãã®ç§»è¡ã 3. 軽éãã§ãã¯ã¢ã¦ãã®ç§»è¡ã ã¹ã¿ã³ãã¢ãã³ãã©ã³ãã®ä¾ã®ããã« **check** ã移è¡ã®åå¾ã«è¡ã£ã¦åé¡ãåå¨ãã¦ããªããããããã¯åé¡ãã²ãããããã¦ããªããã確èªãã¦ãã ããã Launchpadä¸ã®ãã©ã³ããç§»è¡ ------------------------------- å ¬éãã©ã³ãã¨ãã©ã¤ãã¼ããã©ã³ããç¬ç«ãããããã«ãLaunchpadã§ã¯å ±ç¨ãªãã¸ããªã§ã¯ãªããã¹ã¿ãã¯ãã©ã³ãããã£ã¹ã¯å®¹éã®å¹çåã®ä¸å¿æè¡ã¨ãã¦ä½¿ç¨ãã¦ãã¾ãããããã£ã¦Launchpadãã³ã¼ããã¹ãã£ã³ã°ã«ä½¿ç¨ãã¦ããããã¸ã§ã¯ãã§ã¯æ°ãããã©ã¼ãããã¸ã®ç§»è¡ã¯å人ã社å ã§ããããã¦ããã¨ã¯ãã¨ãªãã¾ãã æé ã¯æ¬¡ã®ããã«ãªãã¾ã: 1. æåããã人ãtrunkã®ã³ãã¼ãæã¡ç§»è¡ä½æ¥ãå®æ½ãã¾ãã 2. Launchpadã«ããã¦ã¯ ç¾å¨ã®trunkãéçºã®ä¸å¿(focus)ããã¯ããã¾ãã(ãã㯠*å¿ ã* å®æ½ãã¦ãã ãããããããªãã¨ãã®å¾ã®æé ãæå¾ éãã«ãªãã¾ããã) 3. 移è¡ãã trunk ãLaunchpadã« push ãã¾ãã 4. éçºã®ä¸å¿(focus)ã«è¨å®ãã¾ãã 5. å¤ã trunk ã«ç»é²ãã¦ããã¦ã¼ã¶ã«å¯¾ãã¦æ°ãã trunk ã¸ç»é²ããããä¾é ¼ãã¾ãã ã¤ã¾ãããããã®æé ã®æå³ã¯ãå¤ã trunk ããããã¨ãã¦æå¹ã§ã¹ã¿ãã¯ããããã©ã³ããåå¨ãç¶ããã¨ãããã¨ã§ããããããªããéçºã®ä¸å¿ã¯ç§»è¡å¾ã® trunk ã«åãæ¿ãã£ã¦ããã以å¾ã®Launchpadã«pushãããããªãã®ããã¸ã§ã¯ãã®æ°ãããã©ã³ãã¯(移è¡å¾ã®trunkã«)ã¹ã¿ãã¯ããã¾ãã ãã®æç¹ã§ããªãã¯ããªãã®ã³ãã¥ããã£ã«å¯¾ã㦠æ°ããtrunkãæå¹ã«ãªã£ããã¨ãç¥ãããå½¼ãã«å½¼ãã®ãã¼ã«ã«ãã©ã³ãã移è¡ãã説æããæºåãã§ãã¾ããã ä¸å¤®ã® trunk ã移è¡ããå¾ã®ãã¼ã«ã«ãã©ã³ãç§»è¡ ----------------------------------------------------------- ã¹ã¿ã³ãã¢ãã³ãã©ã³ãã®ç§»è¡æé : 1. ä¸å¤®ãªãã¸ããªã®å ´æããææ°ã®ãã©ã³ããæ°ãããã£ã¬ã¯ããªã«åå¾ãã¾ãã 2. æ¢åã®ãã©ã³ãã®ä¸ã®ããªããè¡ã£ãä¿®æ£ãæ°ãããã©ã³ãã¸pullãããã¯mergeãã¾ãã ãã©ã³ããå ±ç¨ãªãã¸ããªã«ç§»è¡ããæé : 1. æ°ããå ±ç¨ãªãã¸ããªãæ°ãã©ã¼ããã(2aãããã¯ãã以é)ã§ä½æãã¾ãã 2. ä¸å¤®ãªãã¸ããªããææ°ã®ãã©ã³ããä½æããå ±ç¨ãªãã¸ããªã¸æ ¼ç´ãã¾ãã 3. ããªãã®ãã¼ã«ã«ãã©ã³ãã§ç§»è¡ããããã®ã決å®ãã¾ãã(ãã決å®ãã¦ããªããã°ããã¡ããããã¯ã¢ããããå¾ã `Finding obsolete branches`_ããã¦ãã®ãã©ã³ããæ¶å»ããã®ã«ããæéã§ãã) 4. åãã¼ã«ã«ãã©ã³ãã®ç§»è¡ã«é¢ãã¦2ã¤é¸æè¢ãããã¾ãã * æ°ãããªãã¸ããªã§1ã¤ç©ºã®ãã©ã³ãã **init** ãã¦å¤ããªãã¸ããªãããªãã¸ã§ã³ã **pull** ããã * æ°ãªãã¸ããªã«ããã¦ã trunkããæ°ãããã©ã³ãã« **branch** ããå¾å¤ããªãã¸ããªã«ããã¦ããªããè¡ã£ãå¤æ´ã **merge** ããã åè ã®æ¹æ³ã¯(ãªãã¸ã§ã³ã®å±¥æ´ã¨ããæå³ã«ããã¦)å¤ããã©ã³ãã¨åä¸ã®ãã©ã³ããå¾ããã¨ãã§ããä¸æ¹ãparentãã©ã³ãã¯å¤ããã©ã³ããæãã¦ãã¾ããæ°ããtrunkãããã¾ãããããããªãããã®æ¹æ³ãã¨ã£ãå ´åããããã branch.conf ãã¡ã¤ã«ã® parentãã©ã³ãã«é¢ããè¨å®ãããªãããããªãã§ãããã ããã«æ¯è¼ãã¦å¾è ã®æ¹æ³ã¯ parentãã©ã³ãã¯æ£ç¢ºã«è¨å®ããã¾ããããããããããªãããã¹ã¦ã®ææ°ã®ãªãã¸ã§ã³ãtrunkãããã®ãã©ã³ãã«includeããç¨æãã§ãã¦ããªãéãçæ³çãªæ¹æ³ã«ã¯ãªãã¾ããã