ãã©ã³ããç·¨æãã =================== ãã©ã¼ãã©ã³ã ---------------- éçºãããããã«åæ£åã®ã¯ã¼ã¯ããã¼ãå©ç¨ããéã®ä¸»è¦ãªéãã¯\ ã¡ã¤ã³ã®ãã¼ã«ã«ãã©ã³ãã¯å¤æ´ãè¡ãå ´æã§ã¯ãªããã¨ã§ãã 代ããã«ãä¸å¿ãã©ã³ãã®ãã®ã¾ã¾ã®ã³ãã¼ã¨ãã¦ä¿åããã¾ãã ããªãã¡ããã㯠*ãã©ã¼ãã©ã³ã* ã§ãã ãã©ã¼ãã©ã³ããä½ãããã«ã¯ãå ±ç¨ãªãã¸ããª(ã¾ã ãªããã°)ãä½ã\ ãã©ã¼ãä½ãããã« ``branch`` ã³ãã³ã(ããã㯠``checkout``)ã使ãã¾ãã ä¾ã§ã:: bzr init-repo PROJECT cd PROJECT bzr branch bzr+ssh://centralhost/srv/bzr/PROJECT/trunk ã¿ã¹ã¯ã®ãã©ã³ã ----------------- ããããã®æ°ããæ©è½ãããã¯ä¿®æ£ã¯ç¬èªã®ãã©ã³ãã®ä¸ã§éçºããã¾ãã ãããã®ãã©ã³ã㯠*æ©è½ãã©ã³ã* ããã㯠*ã¿ã¹ã¯ãã©ã³ã* ã¨ãã¦è¨åããã¾ã - ç¨èªã¯ãäºãã«ç½®ãæãã¦ä½¿ããã¨ãã§ãã¾ãã ã¿ã¹ã¯ãã©ã³ããä½ãããã«ã¯ããã©ã¼ãã©ã³ãã«å¯¾ã㦠``branch`` ã³ãã³ãã使ãã¾ãã ä¾ã§ã:: bzr branch trunk fix-123 cd fix-123 (hack, hack, hack) ãã®æ¹æ³ã«ã¯æ°å¤ãã®å©ç¹ãããã¾ã: 1. 並è¡ãã¦è¤æ°ã®å¤æ´ã«åãçµããã¨ãã§ãã¾ã 2. å¤æ´ã®éã®äº¤æãæ¸ãã¾ã 3. è¤æ°ã®äººã ã¯æºåãã§ããã¾ã§peer-to-peerã¢ã¼ãã§ãã©ã³ãã«åãçµããã¨ãã§ãã¾ã ã¨ããããå¤æ´ãä»ã®ãã®ããæçããã®ã«æéããããã®ã§ããã°ãã¬ãã¥ã¼ãæ±ãããã ãã£ã¼ãããã¯ãé©ç¨ãããã¨ãã§ãã¾ãã ä¸å¿ãã©ã³ãã«ãã¼ã¸ããåã«åå¥ã®ãã©ã³ãã§ååãªå質ã®ä½æ¥ãå®äºããããã¨ã§ã ä¸å¿ãã©ã³ãã®å質ã¨å®å®æ§ã¯ä»¥åãããé«ãæ°´æºãç¶æãã¾ãã ãã©ã¼ãã©ã³ãããªãã¬ãã·ã¥ãã --------------------------------- ãããè¡ãããã«ã¯ ``pull`` ã³ãã³ãã使ãã¾ã:: cd trunk bzr pull ææ°ã®ãã©ã³ã¯ãæ©è½ãã©ã³ãã«ãã¼ã¸ãã ----------------------------------------- ãããè¡ãããã«ã¯ ``merge`` ã³ãã³ãã使ãã¾ã:: cd fix-123 bzr merge (resolve any conflicts) bzr commit -m "merged trunk" æ©è½ããã©ã³ã¯ã«ãã¼ã¸ãã --------------------------- ç°ãªãåæ£åã®ã¯ã¼ã¯ããã¼ã®æ¹éã¯å¤ããã¾ãã ãã¹ã¦ã®éçºè ãã¡ã¤ã³ãã©ã³ã¯ã«ã³ããããã権éãæã¤æãã·ã³ãã«ãª\ äºä¾ã¯ä¸è¨ã®ã¨ããã§ãã ãã©ã¼ããã§ãã¯ã¢ã¦ããªã:: cd trunk bzr update bzr merge ../fix-123 (resolve any conflicts) bzr commit -m "Fixed bug #123" ãã©ã¼ããã©ã³ãã®å ´å:: cd trunk bzr pull bzr merge ../fix-123 (resolve any conflicts) bzr commit -m "Fixed bug #123" bzr push ã¿ã¹ã¯ãã©ã³ããããã¯ã¢ãããã -------------------------------- éä¸åã¯ã¼ã¯ããã¼ã®å¯ä½ç¨ã®1ã¤ã¯å¤æ´ãITãªãã¬ã¼ã·ã§ã³ã®ä¸é¨ã¨ãã¦\ ããã¯ã¢ãããããä¸å¿ä½ç½®ã«ããã£ã¡ã ãã³ãããããããã¨ã§ãã ã¿ã¹ã¯ãã©ã³ããéçºããã¨ããä½æ¥å 容ãä¸å¿ä½ç½®ã«å ¬éãããã¨ã¯\ ããã¯ã¢ããã«ãªãã®ã§ããèãã§ã(ãããå ±ç¨ä½ç½®ã§ãããã¨ã¯å¿ é ã§ã¯ããã¾ãã)ã ãã®ç®çã®ããã ãã«ãã¼ã«ã«ã®ã¿ã¹ã¯ãã©ã³ããããã¯ã¢ãããµã¼ãã¼ä¸ã§\ 確ç«ããããªã¢ã¼ããã©ã³ãã«ãã¤ã³ãããã¨ããããããã¾ããã