ã¹ã¿ãã¯ãã©ã³ããå©ç¨ãã ========================== ã¹ã¿ãã¯ãã©ã³ãã¨ã¯ï¼ ------------------------- ã¹ã¿ãã¯ãã©ã³ã(stacked branch)ã¯å¥ã®ãã©ã³ãã®ãªãã¸ã§ã³ãè¦ã¤ããæ¹æ³ãç¥ã£ã¦ãã¾ãã ã¹ã¿ãã¯ãã©ã³ãã¯ã¦ãã¼ã¯ãªãªãã¸ã§ã³ã®ã¿ãä¿åãããã¨ã§ãéãä½ããã\ å¹ççã«ä¿åããããã¾ãã ãããã®è¦³ç¹ãããã¹ã¿ãã¯ãã©ã³ãã¯å ±ç¨ãªãã¸ããªã¨ä¼¼ã¦ãã¾ãã ããããªãããã¹ã¿ãã¯ãã©ã³ãã¯è¿½å ã®å©ç¹ãããã¾ã: * æ°ãããã©ã³ãã¯ã¹ã¿ãã¯ããããã©ã³ãã¨ã¯å®å ¨ã«ç°ãªãä½ç½®ã«è¨ç½®ã§ãã¾ãã * ã¹ã¿ãã¯ãã©ã³ããåé¤ããã°(å ±ç¨ãªãã¸ããªã ã¨æ®ã£ã¦ãã¾ã) æ¬å½ã®ãªãã¸ã§ã³ãåé¤ããã¾ã * ã»ãã¥ãªãã£ã¯å ±ç¨ãªãã¸ããªãããåä¸ãã¦ãã¾ãã ã¹ã¿ãã¯ããªã³ãªãã¸ããªã¯ã¹ã¿ãã¯ãã©ã³ãã«ã³ãããããéçºè ã«å¯¾ãã¦ç©ççã«ãªã¼ããªã³ãªã¼ã ããã§ãã ãããã®æ©æµã«ãã£ã¦å®é¨ãã©ã³ãã¨ã³ã¼ããã¹ãã£ã³ã°ãµã¤ããå«ãããã¾ãã¾ãª\ ã·ããªãªã«å¯¾ãã¦ã¹ã¿ãã¯ãã©ã³ãã¯çæ³çãªãã®ã«ãªãã¾ãã ã¹ã¿ãã¯ãã©ã³ããä½æãã ------------------------- ã¹ã¿ãã¯ãã©ã³ããä½æããã«ã¯ãbranchã³ãã³ãã® ``stacked`` ãªãã·ã§ã³ã使ç¨ãã¾ãã ä¾ã§ã:: bzr branch --stacked source-url my-dir ãã®ã³ãã³ãã«ãã£ã¦ ``my-dir`` ããã¼ã«ã«ãªãã¸ã§ã³ãªãã®ã¹ã¿ãã¯ãã©ã³ã\ ã¨ãã¦ä½æããã¾ãã å®ç¾©ãããã¨ã ``source-url`` ã«é¢é£ã¥ããããå ¬éãã©ã³ã㯠*ã¹ã¿ãã¯ããªã³(stacked on)* ã®ä½ç½®ã¨ãã¦ä½¿ããã¾ãã ãããªããã°ã ``source-url`` 㯠*ã¹ã¿ãã¯ããªã³* ã®ä½ç½®ã«ãªãã¾ãã ã¹ã¿ãã¯ãã§ãã¯ã¢ã¦ããä½æãã ----------------------------------- ã¹ã¿ãã¯ãã§ãã¯ã¢ã¦ããç´æ¥ä½æããæ©è½ã¯ã¾ããªããµãã¼ããããäºå®ã§ãã ããã¾ã§ã®éã2段éã®å¦çãå¿ è¦ã§ã: 1. ä¸è¨ã§ç¤ºãããããã«ã¹ã¿ãã¯ãã©ã³ããä½æããã 2. ``reconfigure`` ããã㯠``bind`` ã³ãã³ãã®ã©ã¡ãããå©ç¨ã㦠ãã©ã³ãããã§ãã¯ã¢ã¦ãã«å¤æããã ã¹ã¿ãã¯ãã©ã³ããããã·ã¥ãã --------------------------------- å¤ãã®ããã¸ã§ã¯ãã®å¤§é¨åã®å¤æ´ã¯ *éçºãã©ã³ã¯* or *ç¾å¨ã®å®å®* ãã©ã³ãã¨ãã£ãæ¢åã®ãã©ã³ããåºç¤ã¨ãã¦ãã¾ãã ãããã®1ã¤ã«ã¹ã¿ãã¯ãããæ°ãããã©ã³ãã®ä½æ㯠``push`` ã³ãã³ããå©ç¨ã㦠次ã®ããã«ç°¡åã«ã§ãã¾ã:: bzr push --stacked-on reference-url my-url ãã®ã³ãã³ãã«ãã£ã¦ ``reference-url`` ã«ã¹ã¿ãã¯ããã ``my-url`` ã§æ°ãããã©ã³ããä½æãã ``reference-url`` ã§ã¾ã ãã©ã³ãã«ãªãç¾å¨ã®ãã©ã³ãã®ãªãã¸ã§ã³ã®ã¿ãæ ¼ç´ãã¾ãã ãã¼ã«ã«ãã©ã³ããã¹ã¿ãã¯ãã©ã³ãã¨ãã¦ä½æãããå ´åã ``push`` ããã«ã¯ ``--stacked`` ãªãã·ã§ã³ã使ããã¨ãå¯è½ã§ *stacked-on* ãªä½ç½®ãæ確ã«ãªãã¾ããä¾ã§ã:: bzr branch --stacked source-url my-dir cd my-dir (hack, hack, hack) bzr commit -m "fix bug" bzr push --stacked ã¹ã¿ãã¯ãã©ã³ãã®å¶é ---------------------- ã¹ã¿ãã¯ãã©ã³ãã«é¢ãã¦è¦ãã¦ããã¹ã大äºãªãã¨ã¯ãã»ã¨ãã©å ¨ã¦ã®\ ãªãã¬ã¼ã·ã§ã³ã§ã¹ã¿ãã¯ããªã³ãã©ã³ããå¿ è¦ã«ãªããã¨ã§ãã ããã¯ä¸¡æ¹ã®ãã©ã³ãããã¼ã«ã«ãããã¯åããµã¼ãã¼ã«ããã¨ãã¯\ åé¡ã«ã¯ãªãã¾ããã ã¹ã¿ãã¯ãããã©ã³ããå¤æ´ãã ------------------------------- ``bzr reconfigure`` ã³ãã³ãã使ã£ã¦ã¹ã¿ãã¯ããªã³ãã©ã³ããå¤æ´ããã\ ã¹ã¿ãã¯ããã®ããããããããã¨ãã§ãã¾ãã ``bzr reconfigure --unstacked`` ãå®è¡ããå ´åãbzrã¯å ¨ã¦ã®åç §ããã¦ãããã¼ã¿ã\ ã¹ã¿ãã¯ããªã³ãã©ã³ãããã¹ã¿ãã¯ããã¦ãããã©ã³ãã«ã³ãã¼ãã¦ãããã¨ã«\ 注æãã¦ãã ããã 大ããªã¬ãã¸ããªã«ããã¦ã¯ãããã¯æéãããã£ãããªãã¸ããªãµã¤ãºãå¢å¤§\ ãããããã¾ãã