Bazaarã®å²å¦ ============ Bazaarãå®å ¨ã«ç解ãã ----------------------- Bazaarã¯å¤ãã®ç¹ã§ä»ã®VCSã«ä¼¼ã¦ãã¾ãããæåè¦ãã¨ãã«å¿ ãããæããã§ã¯ãªã大ããªéããããã¤ãããã¾ãã ãã®ã»ã¯ã·ã§ã³ã§ã¯ Bazaarã"grok"ãããããããªãã¡æ·±ãç解ããããã«ã ã¦ã¼ã¶ã¼ãç¥ãå¿ è¦ã®ããããã¤ãã®å 容ã®èª¬æã試ã¿ã¾ãã 注: Bazaarã使ãããã«ãã®ã»ã¯ã·ã§ã³ãååã«ç解ããå¿ è¦ã¯ããã¾ããã ãã®ã»ã¯ã·ã§ã³ããã£ã¨èªãã§å¾ã§æ»ãã¨ããã§ãããã ãªãã¸ã§ã³çªå·ãç解ãã ------------------------ ãã©ã³ãã®ã¡ã¤ã³ã©ã¤ã³ã®ãã¹ã¦ã®ãªãã¸ã§ã³ã¯åç´ã«å¢å ããæ´æ°ãæã¡ã¾ã(æåã®ã³ãããã¯1ã10çªç®ã®ã³ãããã¯10ãªã©ã§ã)ã ããã«ãã£ã¦ "ç§ã®ãã©ã³ããã10çªç®ã®ãªãã¸ã§ã³ãç²å¾ãã"ãããã㯠"ãªãã¸ã§ã³3050ã§ä¿®æ£ãã" ã¨ããè¨ãæ¹ãèªç¶ã«ãªãã¾ãã ãã©ã³ãã«ãã¼ã¸ããããªãã¸ã§ã³ã«é¢ãã¦ã¯ããããã¤ãã®ãã¼ã¸ã§ã³ã使ããã¾ã(ãã¨ãã°ã3112.1.5)ã ãããã¤ãã®ãªãã¸ã§ã³çªå·ã¯3ã¤ã®çªå·ãæã¡ã¾ã [#]_. æåã®çªå·ã¯ã¡ã¤ã³ã®ãªãã¸ã§ã³ã®å¤æ´ã®ç±æ¥ã示ãã¾ãã 2çªç®ã®çªå·ã¯ãã©ã³ãã®ã«ã¦ã³ã¿ã¼ã§ãã åããªãã¸ã§ã³ããå¤ãã®ãã©ã³ããç±æ¥ãããã¨ãããå¾ãã®ã§ããããã®ãã©ã³ãã¯ã¦ãã¼ã¯ãªçªå·ãåå¾ãã¾ãã 3çªç®ã®çªå·ã¯ãã©ã³ãã®éå§ä»¥éã®ãªãã¸ã§ã³çªå·ã§ãã ãã¨ãã°ã3112.1.5ã¯ãªãã¸ã§ã³3112ããã®æåã®ãã©ã³ãã§ããã®ãã©ã³ãä¸ã®5çªç®ã®ãªãã¸ã§ã³ã§ãã .. [#] ãã¼ã¸ã§ã³1.2以åã®bzrã§ã¯å°ãç°ãªãã¢ã«ã´ãªãºã ã使ããã¦ãã¾ããã ããã¤ãã®å ¥ãåã®ãã©ã³ãã¯ããã·ã³ãã«ãª3ã¤ã®çªå·ã·ã¹ãã ã§ã¯ãªã追å ã®çªå·(ãã¨ãã°1.1.1.1.1)ãåå¾ãã¾ãã é層形å¼ã®å±¥æ´ã¯ãããã®ã§ãã ------------------------------- å¤ãã®å¤æ´ãä¸é£ã®ã³ãããã§æ§æãããç¶æ³ã§è¤æ°ã®éçºè ãå¤æ´ãæ稿ããããã¸ã§ã¯ããæ³åãã¦ãã ããã å ·ä½ä¾ã示ãããã«ã次ã®äºä¾ãèãã¦ã¿ã¾ããã: * ããã¸ã§ã¯ãã®ãã©ã³ã¯ã®ãããã¯ãªãã¸ã§ã³100ã§ãã * Maryã¯æ©è½Xãé ä¿¡ããããã«3ã¤ã®å¤æ´ãè¡ã * Billã¯æ©è½Yãé ä¿¡ããããã«4ã¤ã®å¤æ´ãè¡ã éçºè ã並è¡ãã¦ä½æ¥ãã¦ä¼çµ±çãªéä¸åã®VCSã®ã¢ããã¼ããå©ç¨ããå ´åã 大æµã®å ´åããã¸ã§ã¯ãã®å±¥æ´ã¯æ¬¡ã®ããã«Maryã®å¤æ´ã¨Billã®å¤æ´ã交äºã«æ··ããã¾ã:: 107: Add documentation for Y 106: Fix bug found in testing Y 105: Fix bug found in testing X 104: Add code for Y 103: Add documentation for X 102: Add code and tests for X 101: Add tests for Y 100: ... å¤ãã®ãã¼ã ã¯ãã®ã¢ããã¼ããå©ç¨ãã¾ããå½¼ãã®ãã¼ã«ã§ã¯ãã©ã³ãã®ä½æã¨ãã¼ã¸ãé£ããããã§ãã çµæã¨ãã¦ãéçºè ã¯ãã©ã³ã¯ããã®æ´æ°ã¨ã³ããããé »ç¹ã«è¡ãããã¹ã¦ã®ã³ããããéãã¦ãããåºãããã¨ã§çµ±åã®è¦çãæå°åãã¾ãã æãã®ã§ããã°ããã®ããã«Bazaarã使ããã¨ãã§ãã¾ãã Bazaarã¯èæ ®ãã¹ãå¥ã®æ¹æ³ãæä¾ãã¾ãã åæ£åã®VCSãã¼ã«ã«ãã£ã¦æ¨å¥¨ããã代æ¿ã®ã¢ããã¼ãã¯æ©è½ãã©ã³ããä½ããæºåãã§ãããããããçµ±åãããã¨ã§ãã ãã®å ´åãMaryã®æ©è½ãã©ã³ãã¯æ¬¡ã®ããã«ãªãã¾ã:: 103: Fix bug found in testing X 102: Add documentation for X 101: Add code and tests for X 100: ... ããã¦Billã®ãã®ã¯æ¬¡ã®ããã«ãªãã¾ã:: 104: Add documentation for Y 103: Fix bug found in testing Y 102: Add code for Y 101: Add tests for Y 100: ... æ©è½ãç¬ç«ãã¦ãã¦ãªãã¢ãªå±¥æ´ãç¶æãããã®ã§ããã°ãå¤æ´ã¯ãããã§ãã©ã³ã¯ã«pushããã¾ãã (æè¡çã«ã¯ããããè¡ãæ¹æ³ã¯ç¡æ°ã«ããã¾ãããã®æ¤è¨å 容ã®ç¯å²ãè¶ ãã¾ãã) çµæã®å±¥æ´ã¯æ¬¡ã®ããã«ãªãã¾ã:: 107: Fix bug found in testing X 106: Add documentation for X 105: Add code and tests for X 104: Add documentation for Y 103: Fix bug found in testing Y 102: Add code for Y 101: Add tests for Y 100: ... ãããå®ç¾ããããã«å°ãåªåãå¿ è¦ãªä¸æ¹ã§ããªãã¸ã§ã³ãã©ã³ãã ã«ç¹ã交ãããããããã¤ãã®å©ç¹ãããã¾ãã ãããã¿ã¼ã§ãããnon-linearãªå±¥æ´ãå½¢æãã¦ãã©ã³ãã¯ä¸ç·ã«ãã¼ã¸ã§ãã¾ãã çµæã¯æ¬¡ã®ããã«ãªãã¾ã:: 102: Merge feature X 100.2.3: Fix bug found in testing X 100.2.2: Add documentation for X 100.2.1: Add code and tests for X 101: Merge feature Y 100.1.4: Add documentation for Y 100.1.3: Fix bug found in testing Y 100.1.2: Add code for Y 100.1.1: Add tests for Y 100: ... ãããã¯æ¬¡ã®ããã«ãªãã¾ã:: 102: Merge feature X 100.2.3: Fix bug 100.2.2: Add documentation 100.2.1: Add code and tests 101: Merge feature Y 100.1.4: Add documentation 100.1.3: Fix bug found in testing 100.1.2: Add code 100.1.1: Add tests 100: ... å¤ãã®çç±ããããã¯ãããã®ã¨èãããã¾ã: * ããã¸ã§ã¯ãã®å±¥æ´ãç解ããã®ã楽ã«ãªãã¾ãã é¢é£ããå¤æ´ã¯ã¯ã©ã¹ã¿ã¼ãå½¢æãæ確ã«åºåããã¾ãã * ãã©ã³ãã®ã¡ã¤ã³ã©ã¤ã³ä¸ã®ã³ãããã ããè¦ãããã«å±¥æ´ãç°¡åã«æãããããã¨ãã§ãã¾ãã (ãã®ã¬ãã«ã§ã¯èå³ã®ãªãè¨å¤§ãªæ°ã®ã³ãããã®ä»£ããã«) ãã®ãããªãã©ã³ã¯ã®å±¥æ´ãé²è¦§ããã¨ããé«ãã¬ãã«ã®ã³ãããã ãè¦ãã¾ãã * å¿ è¦ã§ããã°ãããç°¡åã«æ©è½ã®å¤æ´ãåãæ¶ãã¾ã * ç¶ç¶çã¤ã³ãã°ã¬ã¼ã·ã§ã³(Continuous integration: CI)ãã¼ã«ã¯ ãã¼ã¸ãã¡ã¤ã³ã©ã¤ã³ã«ã³ãããããããã«ãã¹ã¦ã®ãã¹ããåæ ¼ãããã¨ãä¿è¨¼ããããã«ä½¿ããã¾ãã (å¤ãã®å ´åããã¹ã¦ã®åç¬ã®ã³ãããã®å¾ã§CIãã¼ã«ã®å¼ãéãå¼ãã®ã¯é©åã§ã¯ããã¾ããã ãã¹ãã®ä¸ã«ã¯éçºã®éã«å¤±æãããã®ãããããã§ãã å®éããã¹ããã¡ã¼ã¹ãã®è¿½å - ãã¹ãé§åéçº(TDD)ã®ã¹ã¿ã¤ã« - ã«ãã£ã¦ãããä¿è¨¼ããã¾ãï¼) è¦ç´ããã¨ãéè¦ãªç¹ã¯æ¬¡ã®ã¨ããã§ã: *ãã©ã³ããå©ç¨ãã¦ããªãã®ä½æ¥å 容ãç·¨æãã* *ãã¼ã¸æ©è½ãå©ç¨ãã¦å¤æ´ãçµ±åãã* *é åºã¤ãã®çªå·ã¨é層ã«ãã£ã¦å±¥æ´ã追跡ããã®ã楽ã«ãªã* ããããã®ãã©ã³ãã¯å±¥æ´ã®ç¬èªã®ãã¥ã¼ãæ㤠--------------------------------------------- ä¸è¿°ã®ããã«ãBazaarã¯æ¬¡ã®å 容ãåºå¥ãã¾ã: * ã¡ã¤ã³ã©ã¤ã³ã®ãªãã¸ã§ã³ãããªãã¡ãã©ã³ãã«ã³ããããããã® * ãã¼ã¸ãããªãã¸ã§ã³ããã¼ã¸ãã³ããããããã¨ã§ç¥å ã¨ãã¦è¿½å ããããã® ããããã®ãã©ã³ãã¯å¹ççã«å±¥æ´ã®ç¬èªãã¥ã¼ãæã¡ãããªãã¡ã ç°ãªããã©ã³ãã¯åããªãã¸ã§ã³ã«ç°ãªã"ãã¼ã«ã«ãª"ãªãã¸ã§ã³çªå·ãä¸ãã¾ãã ãã¼ã¸ããããªãã¸ã§ã³ã¯å¸¸ã«ãããã¤ãã®ãªãã¸ã§ã³çªå·ãå ¥æããã®ã«å¯¾ã㦠ã¡ã¤ã³ã©ã¤ã³ã®ãªãã¸ã§ã³ã¯å¸¸ã«åç¬ã®æ°åã®ãªãã¸ã§ã³çªå·ãå²ãå½ã¦ããã¾ãã ä¸è¨ã®ä¾ãæ¡å¼µããããã«ã¯ãMaryãå¤æ´ãå®äºãããå¾ã§ããã¸ã§ã¯ãã®ãã©ã³ã¯ã«ãã¼ã¸ããå¾ã« Maryã®ãã©ã³ãã®ãªãã¸ã§ã³ã®å±¥æ´ã¯æ¬¡ã®ããã«ãªãã¾ã:: 104: Merge mainline 100.2.1: Merge feature Y 100.1.4: Add documentation 100.1.3: Fix bug found in testing 100.1.2: Add code 100.1.1: Add tests 103: Fix bug found in testing X 102: Add documentation for X 101: Add code and tests for X 100: ... ç¹°ãè¿ãã¾ãããMaryã¯ãã®å¤æ´ãéçºããããã«ã¹ããããè¦ãããã«å½¼å¥³ã®å±¥æ´ã®ãããã¬ãã«ã調ã¹ããã¨ãç°¡åã«ãªãã¾ãã ãã®æèã§ã¯ããã©ã³ã¯ã®ãã¼ã¸(ã¨ãããè¡ããã¨ã«ããè¡çªã®è§£æ¶)ã¯ãã®ãã©ã³ãã®å±¥æ´ã«é¢ãã¦ã¯åãªã1ã¤ã®ã¹ãããã§ãã Bazaarã¯å±¥æ´ãå¤æ´ããã®ã§ãªããã°ã°ãã¼ãã«ãªãªãã¸ã§ã³èå¥åãå¤æ´ããã®ã§ããªããã¨ãè¦ãã¦ããã®ã¯å¤§äºã§ãã æ¬å½ã«æãã®ã§ããã°å¸¸ã«å¾è ã使ç¨ã§ãã¾ãã å®éããã©ã³ãã®URLãã³ã³ãã¯ã¹ãã¨ãã¦æä¾ãã *éã* ã³ãã¥ãã±ã¼ã·ã§ã³ãããã¨ãã«ç¹å®ã®ãªãã¸ã§ã³çªå·ã使ããã¨ãã§ãã¾ãã (å¤ãã®Bazaarã®ããã¸ã§ã¯ãã§ã¯ãéçºè ã¯ãã©ã³ãURLãªãã§ãªãã¸ã§ã³çªå·ã交æããã¨ãä¸å¿ã®ãã©ã³ã¯ã®ãã©ã³ããã»ã®ãããã¾ã) ãã¼ã¸ã¯ãã©ã³ãã®ãªãã¸ã§ã³çªå·ãå¤æ´ãã¾ããããããã¯ãã¼ã«ã«ã®ãªãã¸ã§ã³çªå·ãæ°ãããã¼ã¸ãããªãã¸ã§ã³ã«å²ãå½ã¦ãããã§ãã Bazaarããã©ã³ãã®ãªãã¸ã§ã³çªå·ãå¤æ´ããå¯ä¸ã®ã¨ãã¯ããªããæ示çã«å¥ã®ãã©ã³ãããã©ã¼ãªã³ã°ããããã«é ¼ãã¨ãã§ãã 注: ãªãã¸ã§ã³ã¯å®å®ããæ¹æ³ã§çªå·ã¥ãããã¾ã: 2ã¤ã®ãã©ã³ããã¡ã¤ã³ã©ã¤ã³ã§åããªãã¸ã§ã³çªå·ãæã¤ã¨ãã ãã®ãªãã¸ã§ã³ã®ç¥å ã®ãã¹ã¦ã®ãªãã¸ã§ã³ã¯åããªãã¸ã§ã³çªå·ãæã¡ã¾ãã ãã¨ãã°ãAliceã¨Bobã®ãã©ã³ãããªãã¸ã§ã³10ã«ä¸è´ããã®ã§ããã°ããããã¯ãã以åã®ãã¹ã¦ã®ãªãã¸ã§ã³ã§ä¸è´ãã¾ãã è¦ç´ ----- ä¸è¬çã«ãåã«ç¤ºãããã¢ããã¤ã¹ã«å¾ãã®ã§ããã° - ãã©ã³ãã®ä¸ã§ä½æ¥ãã\ é£æºããããã«ãã¼ã¸ã使ã - Bazaarãä¸è¬çã«ããªããæå¾ ãããã¨ãè¡ããã¨ããããã¾ãã 次ã®ç« ã§ã¯ãBazaarãå©ç¨ãããã¾ãã¾ãªæ¹æ³: ãã£ã¨ãåç´ãªããã¸ã§ã¯ããå人ããã¸ã§ã¯ããªã©ã試ãã¾ãã .. vim: ft=rst tw=74 ai