.. This file is autogenerated from the output of .. bzr help topics .. bzr help commands .. bzr help <cmd> .. .. Generation time: 2009-01-09 07:03:09 +0000 ########################## Bazaarã¦ã¼ã¶ã¼ãªãã¡ã¬ã³ã¹ ########################## :Version: 1.11 :Generated: 2009-01-09 .. contents:: :depth: 2 ----- ãã®ãã¥ã¼ããªã¢ã«ã«ã¤ã㦠########################## ãã®ããã¥ã¢ã«ã¯Bazaarã®ãªã³ã©ã¤ã³ãã«ãããçæããã¾ããããªã³ã©ã¤ã³ãã«ãã®ã·ã¹ãã ã å©ç¨ããããã«ã¯æ¬¡ã®ã³ãã³ãã試ãã¦ãã ããã ãã使ãããã³ãã³ãã®ä¸è¦§ãå«ãã¦ç´¹ä»ãã¾ã:: bzr help ãããã¯ã®ä¸è¦§ã¨ããããã®è¦ç´:: bzr help topics ã³ãã³ãã®ä¸è¦§ã¨ããããã®è¦ç´:: bzr help commands ç¹å®ã®ãããã¯ãããã¯ã³ãã³ãã«é¢ãã詳細ãªæ å ±:: bzr help topic-or-command-name 次ã®ã¦ã§ããµã¤ãã¯Bazaarã«é¢ãã詳細ãªæ å ±ãæä¾ãã¾ã: :ãã¼ã ãã¼ã¸: http://www.bazaar-vcs.org/ :å ¬å¼ããã¥ã¡ã³ã: http://doc.bazaar-vcs.org/ :Launchpad: https://launchpad.net/bzr/ æ¦å¿µ #### ãã©ã³ã ========= ãã©ã³ãã¯ããã¹ã¦ã®å±¥æ´ãå«ããããã¸ã§ã¯ãã®ç¶æ ã§æ§æããã¾ãã ãã¹ã¦ã®ãã©ã³ãã¯é¢é£ã¥ãããããªãã¸ããª(ãã©ã³ãã®å±¥æ´ãä¿åãããå ´æ)ãæã¡ã¾ããã è¤æ°ã®ãã©ã³ãã¯åããªãã¸ããªãå ±æãããã¨ãããã¾ã(å ±ç¨ãªãã¸ããª)ã ãã©ã³ãã¯ã³ãã¼ããããã¼ã¸ãããã§ãã¾ãã é¢é£ã³ãã³ã:: init ãã£ã¬ã¯ããªããã¼ã¸ã§ã³ç®¡çããããã©ã³ãã«å¤æ´ããã branch ãã©ã³ãã®æ°ããã³ãã¼ãä½æããã merge 3æ¹åãã¼ã¸ (3-way merge) ãå®è¡ããã ãã§ãã¯ã¢ã¦ã ============== ãã§ãã¯ã¢ã¦ãã¯ãã©ã³ãã«çµã³ã¤ããããã½ã¼ã¹ããªã¼ãªã®ã§ã ã½ã¼ã¹ããªã¼ã«ã³ãããããã¨ãã«ãã³ãããã®å 容ã¯ãã©ã³ãã«æ ¼ç´ããã¾ãã å¿ è¦ã«ãªãã¾ã§Bazaarã®åæ£åæ©è½ã®ä¸é¨ãç¡è¦ãã¦ãããã·ã³ãã«ã«ãéä¸åã®ã¯ã¼ã¯ããã¼ãå©ç¨ã§ãã¾ãã å ±ç¨ãªãã¸ããªã§ãã§ãã¯ã¢ã¦ããå©ç¨ãããã¨ã¯SVNãããã¯CVSã§ã®ä½æ¥ã¨ããä¼¼ã¦ãã¾ãããåãå¶éãæã¡ã¾ããã ããã¦ãã§ãã¯ã¢ã¦ããå©ç¨ãããã¨ã§æãã¯ã¼ã¯ããã¼ããªãã§ããä»ã®äººãããã¸ã§ã¯ãã«åãçµããã¨ãã§ãã¾ãã ãã§ãã¯ã¢ã¦ãã¯bzr checkoutã³ãã³ã("help checkout"ãåç §)ã«ãã£ã¦ä½æããã¾ãã ããã«å¥ã®ãã©ã³ãã¸ã®ãªãã¡ã¬ã³ã¹ã渡ãããã¹ã¿ã¼ãã©ã³ãããã®ãã§ãã¯ã¢ã¦ããä½æãããã©ã³ãã¸ã®ãªãã¡ã¬ã³ã¹ã ã¾ã å«ããã¼ã«ã«ã³ãã¼ãä½æãã¾ãã ä½ãã³ããããããã°ãããã¯ä»ã®ãã©ã³ãã§æåã«ä½æããã¾ãã ããã«ãã£ã¦ä½æ¥å 容ã®ã¤ã³ã¹ã¿ã³ããã©ã¼ãä½æãããããã㯠ããããã®éçºè ãå ±åã§ä½æ¥ãã¦ä»ã®äººã®å¤æ´ãç¶ç¶çã«çµ±åããããã¯ã¹ãããéçºãåæ»ã«ãã¾ãã ããããªãããã§ãã¯ã¢ã¦ãã¯ã¾ã Bazaarã®ç¬¬ä¸ç´ã®ãã©ã³ãã§ããã¹ã¦ã®å±¥æ´ããã¼ã«ã«ã§ä¿åã§ãã¾ãã 第ä¸ç´ã®ãã©ã³ããããã®ã§ããã¼ã«ã«ã«ã³ããããããã¨ãã§ãã¾ãã ãã¨ãã°ããããã¯ã¼ã¯æ¥ç¶ã«ããä¸æçãªé 延ãåé¿ãããã®ã§ããã°ããã¼ã«ã«ã§ãã³ãããã§ãã¾ãã ãããè¡ãã«ã¯ --local ãªãã·ã§ã³ã使ãã¾ãã 次ã«ãã¼ã«ã«ã§ã¯ãªãã³ããããè¡ãã¨ãã«ãã¹ã¦ã®ãã¼ã«ã«ã³ãããã¯ãã¹ã¿ã¼ãã©ã³ãã«è¡ããã¾ãã å ±ç¨ãã©ã³ãããã®ãã§ãã¯ã¢ã¦ãã使ç¨ãã¦ããã¨ããå¨æçã«ä»ã®äººã«ããå¤æ´ããã¹ã¦pullããããªãã¾ãã ããã¯"update"ã³ãã³ãã«ãã£ã¦ã§ãã¾ãã ãã¼ã«ã«ã§ã¯ãªãã³ãããã®åã«å¤æ´ãé©ç¨ãããå¿ è¦ãããã¾ããã Bazaarã¯å¤æ´ãåå¨ãããã¨ãä¼ãå¿ è¦ãªã¨ãã«ãã®ã³ãã³ãã使ãããã«æ示ãã¾ãã checkoutã³ãã³ãã«--lightweightãã©ã°ã渡ããã¨ã§"軽é"ãã§ãã¯ã¢ã¦ããä½æãããã¨ãå¯è½ã§ãã 第ä¸ç´ã®ãã©ã³ãã§ã¯ãªãã主ã«ä½æ¥ããªã¼ã§æ§æãããã¨ããç¹ã§ã軽éãã§ãã¯ã¢ã¦ãã¯SVNã®ãã§ãã¯ã¢ã¦ãã«ããè¿ãã§ãã å±¥æ´ã®ãªãã¬ã¼ã·ã§ã³ã¯ãã¹ã¿ã¼ãã©ã³ãã«åãåãããããªããã°ãªããªãã®ã§ã ãããã¯ã¼ã¯æ¥ç¶ãé¢ããå ´åé ããªãå¯è½æ§ããããã¨ãæå³ãã¾ãã ã¾ãããã¼ã«ã«ãã©ã³ããæããªãã®ã§ããã¼ã«ã«ã§ã³ãããã§ãã¾ããã ãã¹ã¿ã¼ãã©ã³ãã«é«éã§ä¿¡é ¼æ§ã®ããã¢ã¯ã»ã¹æ¨©éãããã¨ãã«è»½éãã§ãã¯ã¢ã¦ãã¯æãè¯ãåä½ãã¾ãã ãã¹ã¿ã¼ãã©ã³ããåããã£ã¹ã¯ãããã¯LANä¸ã«ããã°ã(ãã©ã³ãã®ã³ãã¼ã®æ´æ°ã ããå¿ è¦ãªã®ã§) ãªãã¸ã§ã³ãå¤æ´ããã©ã®ã³ãã³ãã§ã軽éãã©ã³ãã¯ééãã©ã³ããããéããªããã¨ãæå³ãã¾ãã ä¸è¬çã«ééãã§ãã¯ã¢ã¦ãã¯éãã§ããããã¹ã¿ã¼ãã©ã³ããåããã£ã¹ã¯ä¸ã®ããã¨ãã¯ãé¡èãªéãã¯ããã¾ããã ãã§ãã¯ã¢ã¦ãã®å¥ã®ä½¿ãæ¹ã¯ãã©ã³ããæ ¼ç´ããããªã¼ãªãã®ãªãã¸ããªã§ä½¿ããã¨ã§ãã ããã§ã¯ç°ãªããã©ã³ãã«åãçµãã¨ããã§ãã¯ã¢ã¦ããæå®ãããã¹ã¿ã¼ãã©ã³ããåãæ¿ãããã¨ã§ 1ã¤ã®ä½æ¥ããªã¼ã ããç¶æãã¾ãã æ確ã«ãã§ãã¯ã¢ã¦ãã«ã³ãããããã«ã¯ãã¹ã¿ã¼ãã©ã³ãã¸ã®æ¸ãè¾¼ã¿æ¨©éãå¿ è¦ã§ãã ãã¹ã¿ã¼ãã©ã³ãã¯sftp://ã¨ãã£ãæ¸ãè¾¼ã¿å¯è½ãªãããã³ã«ã§ã¢ã¯ã»ã¹ããªããã°ãªããªãã®ã§ã ç¸ææ¹ã§æ¸ãè¾¼ã¿æ¨©éããããªããã°ãªããªããã¨ãæå³ãã¾ãã ãã§ãã¯ã¢ã¦ãã¯ãã¼ã«ã«ãã¡ã¤ã«ã·ã¹ãã ã§ãæ©è½ããã®ã§ããã¹ã¦ã®åé¡ã¯ãã¡ã¤ã«ã®ãã¼ããã·ã§ã³ã§ãã "bind"ã³ãã³ã("help bind"ãåç §)ã使ç¨ãããã¨ã§ãã§ãã¯ã¢ã¦ãã®ãã¹ã¿ã¼ãå¤æ´ã§ãã¾ãã ããã«ãã£ã¦ã³ããããéä¿¡ãããä½ç½®ãå¤æ´ããã¾ãã bindã³ãã³ãã¯ãã©ã³ããheavyãã§ãã¯ã¢ã¦ãã«å¤æããããã«ã使ç¨ã§ãã¾ãã ãã¹ã¦ã®ã³ãããããã¼ã«ã«ã§è¡ãããããã«heavyãã§ãã¯ã¢ã¦ããé常ã®ãã©ã³ãã«å¤æãããå ´åã "unbind" ã³ãã³ãã使ç¨ã§ãã¾ãã é¢é£ã³ãã³ã:: checkout ãã§ãã¯ã¢ã¦ããä½æããã軽éãã§ãã¯ã¢ã¦ããå¾ãã«ã¯ --lightweight ã渡ã update ãã¹ã¿ã¼ãã©ã³ãã®å¤æ´ãããªãã®ãã§ãã¯ã¢ã¦ãã«pullãã commit ãã¹ã¿ã¼ãã©ã³ãã«éä¿¡ãããã³ããããè¡ãã ééãã§ãã¯ã¢ã¦ãã§ããã° --localãªãã·ã§ã³ã«ãã£ã¦ ãã¹ã¿ã¼ã«ã³ããããéä¿¡ããã«ãã§ãã¯ã¢ã¦ãã«ã³ãããããã¾ã bind éä¿¡ããããã§ãã¯ã¢ã¦ãã«ã³ãããããããã¹ã¿ã¼ãã©ã³ããå¤æ´ãã unbind ã³ãããããã¼ã«ã«ã ãã§è¡ãããããã«ééãã§ãã¯ã¢ã¦ããã¹ã¿ã³ãã¢ãã³ã®ãã©ã³ãã«å¤æãã ã¯ãªã¹ã¯ãã¹ ============ ãã©ã³ãã®å±¥æ´ã®ã¯ãªã¹ã¯ãã¹(Criss-cross)ã¯é常æå¾ ããããããå¤ãã®ã³ã³ããªã¯ããåºãããã©ã«ãã®ãã¼ã¸ãã¯ããã¯ãå¿ è¦ã¨ãã¾ãã è¤éãªãã¼ã¸ã®å ´åã ``bzr merge --lca`` ããã㯠``bzr merge --weave`` ã§ã¯ããããçµæã«ãªãããããã¾ããã ä½æ¥ããªã¼ã ``bzr revert`` ãã¦å度ãã¼ã¸ãããã¨é¡ãããããã¾ããã 代ããã«ãç¹å®ã®è¡çªãã¦ãããã¡ã¤ã«ä¸ã§ ``bzr remerge`` ã使ãã¾ãã 2ã¤ã®ãã©ã³ããåããã®ããã¼ã¸ãã¦ãäºãã«ãã¼ã¸ãåãå ´åã ãããã¯2ã¤ã®ãã©ã³ããåæã«ãäºãããã¼ã¸ããå ´åãã¯ãªã¹ã¯ãã¹ã¯ãã©ã³ãã®ä¸ã§çºçãã¾ãã ããããã®ãã©ã³ããç®çã®éä¸åãã©ã³ããããããã¯ãã®ãã©ã³ãããã®ã¿ãã¼ã¸ãããã¨ã§ããããåé¿ã§ãã¾ã("star topology")ã ãã¼ã¸ãåä½ããæ¹æ³ã®ããã¯ãªã¹ã¯ãã¹ã¯åé¡ãå¼ãèµ·ããã¾ãã Bazaarã®ããã©ã«ããã¼ã¸ã¯ä¸æ¹åãã¼ã¸ã§ã; OTHERãTHISã«ãã¼ã¸ããã«ã¯æ¯è¼ãBASEç¨ã®åºæ¬ãè¦ã¤ããªããã°ãªãã¾ããã BASEãå©ç¨ãããã¨ã§ãTHISã¨OTHERã®éããè¡ã追å ããã¯ã³ãµã¤ãããè¡ãåé¤ããå¥ã®ãµã¤ãã«ããã®ãã決å®ã§ãã¾ãã ã¯ãªã¹ã¯ãã¹ã¯ãã¼ã¹ã«é¢ãã¦ããé¸æè¢ããªããã¨ãæå³ãã¾ãã æè¿ã®ãã¼ã¸ãã¤ã³ããé¸æãããã¨ã¯ã¯ã³ãµã¤ãã®å¤æ´ãå°ãå»æ£ãã¦ãã¾ãå¯è½æ§ãããã¾ãã (Bazaarãè¡ã)å¤ããã¼ã¸ãã¤ã³ããé¸æãããã¨ã¯ä½åãªè¡çªãçºãããããã¨ãæå³ãã¾ãã ``weave`` ãã¼ã¸ã¿ã¤ãã¯ãã®åé¡ã®å½±é¿ãåãã¾ããã ãã®ã¿ã¤ãã¯éãã®åå ã決å®ããããã«ãã¼ã¹ã®ãªãã¸ã§ã³ã®ä»£ããã«è¡ãèµ·ç¹ã¨ããæ¤åºæ¹æ³ãå©ç¨ããããã§ãã ã¹ãã¬ã¼ã¸ãã©ã¼ããã ======================= å¤ãã¯ã©ã¤ã¢ã³ããä¸æ£ã«ãã¼ã¿ã«ã¢ã¯ã»ã¹ããªããã¨ãä¿è¨¼ããããã«ã Bazaarã®ããªã·ã¼ã§ã¯æ°ããæ©è½ãæ°ããã¡ã¿ãã¼ã¿ã追å ããå¿ è¦ãããã¨ãã« æ°ãããã©ã¼ããããå°å ¥ãããã¨ã«ãã¦ãã¾ããæ°ããã¹ãã¬ã¼ã¸ãã©ã¼ããã㯠ããã©ã¼ãã³ã¹ã¨ã¹ã±ã¼ã©ããªãã£ãæ¹åããããã«å°å ¥ãããã¨ãããã¾ãã ãã©ã¼ããããé¸ã¶ããã«æ¬¡ã®ã¬ã¤ãã©ã¤ã³ãå©ç¨ãã¾ã(æ¡ä»¶ãtrueã§ããã¨åæã«åæ¢): * æ¢åã®ããã¸ã§ã¯ãã«åãçµãã§ããå ´åãããã¸ã§ã¯ããå©ç¨ãã¦ãããã®ã使ç¨ãã¾ãã (ããã©ã«ãã§Bazaarã¯ããªãã®ä»£ããã«ãããè¡ãã¾ã)ã * Subversionãªãã¸ããªã¨é£æºããbzr-svnãå©ç¨ãã¦ããå ´åã¯ã 1.9-rich-rootã使ç¨ãã¾ãã * 大ããªããªã¼(5000以ä¸ã®ãã¹)ãããã¯æ·±ãå±¥æ´(5000以ä¸ã®ãªãã¸ã§ã³)ãæ㤠ããã¸ã§ã¯ãã«åãçµãã§ããã®ã§ããã°ã1.9ã使ç¨ãã¾ãã * ãããªããã°ãããã©ã«ãã®ãã©ã¼ãããã使ç¨ãã¾ãã大æµã®ããã¸ã§ã¯ãã¯ããã§ååã§ãã (ãã£ã¹ããã®ããã±ã¼ã¸ãå©ç¨ãã¦ãããªã©ã§)ææ°ã®Bazaarãå©ç¨ã§ããªãéçºè ãããã®ã§ããã°ã ããã«å¿ãã¦ã¬ã¤ãã©ã¤ã³ã調æ´ãã¦ãã ããã ãã¨ãã°ãããã¸ã§ã¯ããBazaar 1.7ãæ¨æºåãã¦ããå ´åã1.9ã®ä»£ããã«1.6ãé¸ã¶ãã¨ãå¿ è¦ã§ãã 注: ç¾å¨ãµãã¼ãããããã©ã¼ãããã®å¤ãã¯2ã¤ã®ããªã¢ã³ããæã¡ã¾ã: plainã®ãã®ã¨rich-rootã®ãã®ã§ãã å¾è ã¯ããªã¼ã®rootã«é¢ãã追å ãã£ã¼ã«ããå«ã¿ã¾ãã rich-rootãã©ã¼ããããå©ç¨ããéã«ããã©ã¼ãã³ã¹ã³ã¹ãã¯ããã¾ããã rich-rootãã©ã¼ãããããã®å¤æ´ãplainãã©ã¼ãããã«ç°¡åã«ãã¼ã¸ã§ãã¾ããã çµæã¨ãã¦ããã¹ã¦ã®æ稿è ãã»ã¼åæã«ãªãã¸ããªãã¢ããã°ã¬ã¼ãããå¿ è¦ãããã®ã§ã ããã¸ã§ã¯ããrich-rootãã©ã¼ãããã«ç§»è¡ãããã«ã¯èª¿æ´ãå¿ è¦ã§ãã (ããã¾ã§ã®ã¨ããrich-rootãã©ã¼ããããããã©ã«ãã«ãããã¨ãé ããã¦ããçç±ã§ãã å°æ¥ã®é©åãªææã«ãããè¡ãã¾ãã) ç¾å¨ãµãã¼ãããããã©ã¼ãããã®å®å ¨ãªãªã¹ãã«é¢ãã¦ã¯ ``bzr help current-formats`` ãåç §ãã¦ãã ããã å©ç¨å¯è½ã§å®é¨ä¸ãããã¯å»æ¢ããããã©ã¼ãããã«é¢ãã¦ã¯ ``bzr help other-formats`` ãåç §ãã¦ãã ããã ãã¿ã¼ã³ ======== Bazaarã¯ãã¾ãã¾ãªæç¹ã§ããããããã¡ã¤ã«ã使ç¨ãã¾ãã ãã¨ãã°ã ``add`` ã³ãã³ãã¯ç¡è¦ãããã¿ã¼ã³ã«ããããããã¡ã¤ã«ã¨ã¹ãããã ããªãã¡ã¬ã³ã¹ã¯ã«ã¼ã«ãã¿ã¼ã³ã使ç¨ãããã¡ã¤ã«ã«é¢é£ã¥ãã§ãã¾ãã ãã¿ã¼ã³æ§æã¯ä¸è¨ã®ã¨ããã§ãã ãã¿ã¼ã³ä¸ã®ãã¬ã¼ãªã³ã°ã¹ã©ãã·ã¥ã¯ç¡è¦ããã¾ãã ãã¿ã¼ã³ãã¹ã©ãã·ã¥ãå«ããããã¯æ£è¦è¡¨ç¾ã§ããå ´åããã©ã³ãã®rootå ¨ä½ããæ¯è¼ããã¾ãã ãããªããã°ãããã¯ãã¹ã®æå¾ã®ã³ã³ãã¼ãã³ãã®ã¿ã¨æ¯è¼ããã¾ãã rootãã£ã¬ã¯ããªã®ä¸ã®ãã¡ã¤ã«ã®ã¿ã«ããããããã«ã¯'./'ãç¨æãã¾ãã 絶対ãã¹ãæå®ãããã¿ã¼ã³ã¯è¨±å¯ããã¦ãã¾ããã ãã¿ã¼ã³ã¯æ¬¡ã®ãããªglobã®ã¯ã¤ã«ãã«ã¼ããå«ããã¨ãã§ãã¾ã:: ? - '/'以å¤ã®åç¬æåã«ããããã * - '/'以å¤ã®0ããã以ä¸ã®æåæ°ã«ããããã /**/ - ãã¹ã®ä¸ã®ã¼ãããã以ä¸ã®ãã£ã¬ã¯ããªã«ããããã [a-z] - æåã®ã°ã«ã¼ãã®ç¯å²å ããã®åç¬ã®æåã«ããããã ãã¿ã¼ã³ã¯Pythonã®æ£è¦è¡¨ç¾ã«ããªãã¾ãã æ£è¦è¡¨ç¾ã®ãã¿ã¼ã³ã¯ 'RE:' ã®æ¥é è¾ã§å§ã¾ãæ£è¦è¡¨ç¾ã§èå¥ããã¾ãã æ£è¦è¡¨ç¾ã®ãã¿ã¼ã³ã¯ååã¤ããããã¯çªå·ã¤ãã®ã°ã«ã¼ããå«ããã¨ã¯ã§ãã¾ããã ãªãã¸ã㪠=========== Bazaarã®ãªãã¸ããªã¯ã³ããããããæ å ±ãä¿åãããå ´æã§ãã ãã¹ã¦ã®ãã©ã³ãã¨é¢é£ã¥ãããããªãã¸ããªã1ã¤åå¨ãã¾ãã ãªãã¸ããªã¯ä¸ç¨®ã®ãã¼ã¿ãã¼ã¹ã§ãã é常ãããã©ã¼ãã³ã¹ã®ããã«Bzrã¯ãããèªåçã«ç¶æãã¾ãããããç¶æ³(ãã¨ãã°çãæéã«ã¨ã¦ãå¤ãã®ã³ããããè¡ã) ãã¼ã¿ãã¼ã¹ã®ã¤ã³ããã¯ã¹ãæé©åããããbzrã«æ±ããã¨ããã§ãããã ããã¯'bzr pack' ã³ãã³ãã«ãã£ã¦è¡ããã¾ãã ããã©ã«ãã§ã¯ 'bzr init' ãå®è¡ããã ãã§æ°ãããã©ã³ãã®ä¸ã§ãªãã¸ããªãä½æããã¾ããã åãä½ç½®ã§æ å ±ãå ±æããããã«è¤æ°ã®ãã©ã³ãã許å¯ããå ±ç¨ãªãã¸ããªãä½æãããã¨ãå¯è½ã§ãã æ°ãããã©ã³ããä½æãããã¨ã使ç¨ã§ããå ±ç¨ãªãã¸ããªãåå¨ãããã©ãããæåã«ç¢ºèªãã¾ãã åãããã¸ã§ã¯ãã®ãã©ã³ãã1ã¤ã®ãªãã¸ããªãå ±æããã¨ããä¸è¬çã«ã¹ãã¼ã¹ã大ããç¯ç´ããã¾ãã (ãã¨ãã°ãªãã¸ããªã®ç¯å²å ã§ãã©ã³ããä½æãããªã©ã®)ããã¤ãã®ã³ãã³ãã«å¯¾ãã¦ããã¯å¤§ããªæéã®ç¯ç´ã«ãªãã¾ãã å ±ç¨ãªãã¸ããªãä½ãã«ã¯ãinit-repositoryã³ãã³ã(ãããã¯ã¨ã¤ãªã¢ã¹ã®init-repo)ã使ãã¾ãã ãã®ã³ãã³ãã¯ä½æãããªãã¸ããªã®ä½ç½®ãã¨ãã¾ãã ãã®ãã¨ã¯'bzr init-repository repo'ã«ãã£ã¦'repo'ã¨ããååã®ãã£ã¬ã¯ããªãä½æãã ãã®ä¸ã«å ±ç¨ãªãã¸ããªãæ ¼ç´ããããã¨ãæå³ãã¾ãã ãã®ãã£ã¬ã¯ããªã®ä¸ã«ä½æãããæ°ãããã©ã³ãã¯ã¹ãã¬ã¼ã¸ç¨ã«ããã使ç¨ãã¾ãã 1ã¤ä»¥ä¸ã®ããã¸ã§ã¯ãã®ãã©ã³ããä½æããã¨ãã«1ã¤ã®ãªãã¸ããªãä½æãããã¨ã¯ããèãã§ãã ããã¯éçºãè¡ã£ã¦ããä½æ¥é åã¨ããã¹ãã£ã³ã°ããã¸ã§ã¯ãç¨ã®ãµã¼ãã¼é åã®ä¸¡æ¹ã«ãã¦ã¯ã¾ãã¾ãã å¾è ã®å ´åãä½æ¥ããªã¼ãªãã®ãã©ã³ãã欲ãããã¨ã¯è¯ãããã¾ãã ãã©ã³ãã®ãã¡ã¤ã«ã¯ç´æ¥ç·¨éãããªãã®ã§ä½æ¥ããªã¼ç¨ã«ãã£ã¹ã¯ã¹ãã¼ã¹ã使ãåãå¿ è¦ã¯ããã¾ããã ä½æ¥ãã©ã³ããæããªããªãã¸ããªãä½æããã«ã¯ã 'init-repository'ã«'--no-trees'ãªãã·ã§ã³ã渡ãã¾ãã é¢é£ã³ãã³ã:: init-repository å ±ç¨ãªãã¸ããªãä½æããã æ°ãããã©ã³ããä½æ¥ããªã¼ãä½æããªããã®ãä½æããã«ã¯--no-treesã使ç¨ããã ã«ã¼ã« ======= ç´¹ä» ----- ã«ã¼ã«ã¯iniãã¡ã¤ã«ãã©ã¼ãããã§å®ç¾©ããã¾ãã ã»ã¯ã·ã§ã³ã¯ãã¡ã¤ã«ã®globãã¿ã¼ã³ã§ããããã®ã»ã¯ã·ã§ã³ã®å 容㯠ãã®ãã¿ã¼ã³ã«ããããããã¡ã¤ã«ç¨ã®ããªãã¡ã¬ã³ã¹ã§ããä¾ã§ã:: [name *.bat] eol = dos [name *.html] keywords = escape ãããã®ãããªããªãã¡ã¬ã³ã¹ã¯é¸æããããã©ã³ãã®ä¸ã§ é¸æããããã¡ã¤ã«ç¨ã«ã«ã¹ã¿ã ã®ãµãã¾ããæä¾ãããã³ãã³ãã¨ãã©ã°ã¤ã³ã«å½¹ç«ã¡ã¾ãã ãã¡ã¤ã« --------- ãã¹ã¦ã®ãã©ã³ãç¨ã®ããã©ã«ãã«ã¼ã«ã¯ãªãã·ã§ã³ã® ``BZR_HOME/rules`` ãã¡ã¤ã«ã§å®ç¾©ããã¾ãã ã«ã¼ã«ã®ãã¿ã¼ã³ ----------------- ãã¿ã¼ã³ã¯é åºã¥ããã1ã¤ãããããã¨å ±ã«æ¤ç´¢ã¯åæ¢ãã¾ãã çµæã¨ãã¦ãããæ確ãªãã¿ã¼ã³ããã¡ã¤ã«ã®ãããã®æ¹ã«ç½®ãã¹ãã§ãã ã«ã¼ã«ãã¿ã¼ã³ã¯ç¡è¦ãã¿ã¼ã³ã¨ã¾ã£ããåãä»æ§ãå©ç¨ãã¾ãã 詳細㯠``bzr help patterns`` ãåç §ãã¦ãã ããã 注: è§ãã£ããå«ããã¿ã¼ã³ã¯ããããæ£ãã解æãããããã«ã¯ã©ã¼ãã§å²ã¾ãªããã°ãªãã¾ããã ã¹ã¿ã³ãã¢ãã³ã®ããªã¼ ======================= ã¹ã¿ã³ãã¢ãã³ã®ããªã¼ã¯é¢é£ãªãã¸ããªãæã¤ä½æ¥ããªã¼ã§ãã ä»ã«ä¾åãã¦ããªãã®ã§ãããã¯ç¬ç«ãã¦å©ç¨ã§ãããã©ã³ãã§ãã (bzr initãéãã¦)ã¹ã¿ã³ãã¢ãã³ã®ããªã¼ã®ä½æ㯠æ¢åã®ããã¸ã§ã¯ãããã¼ã¸ã§ã³ç®¡çã®å ã«ç½®ãããã®æãéãæ¹æ³ã§ãã é¢é£ã³ãã³ã:: init ãã£ã¬ã¯ããªããã¼ã¸ã§ã³ç®¡çä¸ã«ãããã©ã³ãã«ããã åæåãããã¦ãããã©ã³ã ========================== ãã§ãã¯ã¢ã¦ããããªã¼ãããã¯ãã©ã³ãã軽éãã©ã³ãã«åè¨å®ããã¨ãã ãã¼ã«ã«ã®ãã©ã³ããç ´å£ããªããã°ãªãã¾ããã (ãã§ãã¯ã¢ã¦ãã«é¢ãã¦ãããã¯ãã£ãã·ã¥ã¨ãã¦æåã«æä¾ãããã¼ã«ã«ãã©ã³ãã§ãã) ç ´å£ããããã©ã³ããåãæçµãªãã¸ã§ã³ãæããªããã°ã 軽éç¨ãã§ãã¯ã¢ã¦ãç¨ã®æ°ããåç §ãã©ã³ãããã¼ã¿ã失ãããå¯è½æ§ãããã®ã§ã Bazaarã¯æå¦ãã¾ãã ãã®åãçµã¿æ¹ã¯ *ãªã* ãã©ã³ãã®åæããããã®ãã«ããã¾ãã ãã§ãã¯ã¢ã¦ããæå ã«ãããã¼ã«ã«ã³ããããè¡ãå ´åã "bzr update"(ã¨ããããã¯"bzr commit")ãå®è¡ãããã¨ã§åã³åæåã§ãã¾ãã ãã©ã³ããæå ã«ããããªã¢ã¼ããã©ã³ããæ代é ãã«ãªã£ã¦ããå ´åã "bzr push"ã使ç¨ãã¦ãã¼ã«ã«ã®å¤æ´ãããã·ã¥ã§ãã¾ãã ãã¼ã«ã«ãã©ã³ããæ代é ãã§ããã°ã"bzr pull"ãã§ãã¾ãã 両æ¹ã®ãã©ã³ãã«å¤æ´ãããã°ãå¤æ´ããã¼ã¸ãã³ããããã¦ããã·ã¥ã§ãã¾ãã å¤æ´ã®ä¸é¨ã便å©ã§ãªããã°ã"push --overwrite"ãããã¯ä»£ããã«"pull --overwrite"ã§ãã¾ãã ä½æ¥ããªã¼ =========== ä½æ¥ããªã¼ã¯ãã£ã¹ã¯ä¸ã«è¨ç½®ããããã©ã³ãã®ã³ã³ãã³ããªã®ã§ãã¡ã¤ã«ãè¦ã¦ç·¨éã§ãã¾ãã ä½æ¥ããªã¼ã¯ãã©ã³ãã«å¤æ´ãè¡ãå ´æãªã®ã§ã ä½æ¥ããªã¼ã®ç¾å¨ã®ç¶æ ãã³ãããããã¨ããã³ãããã«è¨é²ãããã¬ã³ã¼ãã§ãã ãã©ã³ãããªã¢ã¼ãã·ã¹ãã ã«ããã·ã¥ããã¨ããä½æ¥ããªã¼ã¯ä½æããã¾ããã ãã¡ã¤ã«ããã§ã«åå¨ããã°ããã¡ã¤ã«ã¯æ´æ°ããã¾ããã ãã©ã³ãã®æ å ±ã¯æ´æ°ããä½æ¥ããªã¼ã¯æ代é ãã¨ãã¦ãã¼ã¯ããã¾ãã ãªã¢ã¼ãã®ä½æ¥ããªã¼ãæ´æ°ããã®ã¯é£ããã§ãã ã¢ã³ã³ããããããå¤æ´ãåå¨ãããããã¯æ´æ°ã«ãã£ã¦ãªã¢ã¼ãã§æ±ãã®ãé£ããå 容ã®è¡çªãå¼ãèµ·ããããããã§ãã ä½æ¥ããªã¼ãªãã®ãã©ã³ããããã° ä½æ¥ããªã¼ãä½æããããã« 'checkout' ã³ãã³ãã使ç¨ã§ãã¾ãã ãã©ã³ããã 'bzr checkout .' ãå®è¡ããã¨ä½æ¥ããªã¼ãä½æããã¾ãã ãªã¢ã¼ãã§ãã©ã³ããæ´æ°ãããã¨ããã®ãã£ã¬ã¯ããªã®ä¸ã§'bzr update'ãå®è¡ãããã¨ã§ä½æ¥ããªã¼ãæ´æ°ã§ãã¾ãã æã¾ãªãä½æ¥ããªã¼ãæã¤ãã©ã³ããããå ´åãå®å ¨ã§ããã°'remove-tree'ã³ãã³ãã¯ããªã¼ãé¤å¤ãã¾ãã ãã©ã³ãã«ããã·ã¥ããã¨ãæ´æ°ãããªããªã¢ã¼ãä½æ¥ããªã¼ã«é¢ããè¦åãåé¿ãããã¨ã§ããã¯å¯è½ã§ãã ããã¯'--no-trees'ãªãã¸ããª('bzr help repositories'ãåç §)ã«åãçµãã¨ãã«ã便å©ã§ãã ããã·ã¥ãããªã¢ã¼ããã·ã³ä¸ã§ä½æ¥ãã©ã³ããæã¡ããå ´åã pushãããã¨ã«ãªã¢ã¼ããã©ã³ãã§'bzr update'ãå®è¡ãããã pushã®éã«ããªã¼ãæ´æ°ããä»ã®æ¹æ³ã使ç¨ã§ãã¾ãã rsyncã使ç¨ãã¦pushã¨åãããã«ä½æ¥ããªã¼ãæ´æ°ãã'rspush'ãã©ã°ã¤ã³ãåå¨ãã¾ãã ããããã®ããã·ã¥ã®å¾ã§'bzr update'ãèªåçã«å®è¡ãã'push-and-update'ãã©ã°ã¤ã³ãåå¨ãã¾ãã 便å©ãªã³ãã³ã:: checkout ãã©ã³ããä½æ¥ããªã¼ãæããªãã¨ãã«ãããä½æããã remove-tree ãããè¡ãã¨ãã«å®å ¨ã§ããã¨ãã«ãã©ã³ãããä½æ¥ããªã¼ãé¤å¤ããã update ä½æ¥ããªã¼ãé¢é£ãã©ã³ãããåæãããã¦ããã¨ã ãã®ã³ãã³ãã«ãã£ã¦ãã©ã³ãã«ãããããããªã¼ãæ´æ°ãããã .. _formats: `ã¹ãã¬ã¼ã¸ãã©ã¼ããã`_ .. _standalone-trees: `ã¹ã¿ã³ãã¢ãã³ã®ããªã¼`_ .. _sync-for-reconfigure: `åæåãããã¦ãããã©ã³ã`_ .. _working-trees: `ä½æ¥ããªã¼`_ ãªã¹ã ####### èªè¨¼ã®è¨å® =========== Intent ------ ``authentication.conf`` ãã¡ã¤ã«ã®ä¸ã§å¤ãã®ç°ãªãèªè¨¼ããªã·ã¼ã¯è¨è¿°ã§ãã¾ãã ç¹å®ã®ã¦ã¼ã¶ã¼ã¯ãã¹ã¦ã®ãã©ã³ãç¨ã®ã¦ã¼ã¶ã¼ã¨ãã¹ã¯ã¼ããæå®ããªãã¦ã èªåã®ãã¼ãºãã«ãã¼ããããããªå®ç¾©ã ããå¿ è¦ã§ãã ãã®ãã¡ã¤ã«ã®ä¸ã§è¦ã¤ããå®ç¾©ã¯ä¸ããããurlç¨ã®ã¯ã¬ãã³ã·ã£ã«ãè¦ã¤ããããã«ä½¿ããã¾ãã ä¸è¬çã«åãã¯ã¬ãã³ã·ã£ã«ãå¿ è¦ã¨ãããªã¢ã¼ããµã¼ãã¼ã®å¨è¾ºã§å®£è¨ãåé¡ãããã¨ã§å¯è½ãªéãå¤ãã®ãã©ã³ãã«å¯¾ã㦠ã¯ã¬ãã³ã·ã£ã«ã使ç¨ã§ãã¾ãã ç°ãªããµã¼ãã¼ã«ãã£ã¦ä½¿ç¨ãããã¯ã¬ãã³ã·ã£ã«ã宣è¨ãããã¨ãå¯è½ã§ãã intentã¯ç¶æãæå°ã«ããããã«ãã®ãã¡ã¤ã«ãå¯è½ãªéãå°ãããããã®ã§ãã ãã®ãã¡ã¤ã«ã®ä¸ã§é¢é£ã®ã¯ã¬ãã³ã·ã£ã«ã宣è¨ãããã¨ãã¹ã¯ã¼ã(ã»ãã¥ãªãã£ãã¶ã¼ã)ãåãè¾¼ã¾ã ãããã¯(ä»ã®äººã¨URLã®å ±æãæå¹ã«ãã)ã¦ã¼ã¶ã¼ãªãã§ãã©ã³ãã®URLãå©ç¨ã§ãã¾ãã 次ã®URLããã:: bzr branch ftp://joe:secret@host.com/path/to/my/branch ã·ã³ãã«ã«ãªãã¾ã:: bzr branch ftp://host.com/path/to/my/branch ``authentication.conf`` ãã¡ã¤ã«ãä½æãããã¨ãåæã¨ãã¾ã:: [myprojects] scheme=ftp host=host.com user=joe password=secret èªè¨¼ã®å®ç¾© ----------- bzrã«ãã£ã¦ãµãã¼ãããããã¾ãã¾ãªã¹ãã¼ã ã«ãã£ã¦ä½¿ç¨ããã2種é¡ã®èªè¨¼ãããã¾ã: 1. ã¦ã¼ã¶ã¼ã¨ãã¹ã¯ã¼ã ``FTP`` 㯠``host`` ç¨ã« (``user`` ã ``password``) ãå¿ è¦ã¨ãã¾ãã ``SFTP`` ã¯èªè¨¼ç¨ã«ãã¹ã¯ã¼ããããã¯ãã¹ããã¼ã使ç¨ã§ãã¾ãã ããããªãããsshã¨ã¼ã¸ã§ã³ãã¯ãã¿ã¼ã§ãããã»ãã¥ã¢ãªè§£æ±ºæ¹æ³ã§ãã ç¬èªã®ã»ãã¥ã¢ã§ã¯ãªãæ¹æ³ãæä¾ããªããã¨ã«ãã¾ãã 2. ã¦ã¼ã¶ã¼ãé åã¨ãã¹ã¯ã¼ã ãã¹ãã«å¯¾ãã¦èªè¨¼ããããã« ``HTTP`` 㨠``HTTPS`` ã¯(``user, realm, password``)ãå¿ è¦ã¨ãã¾ãã ``.htaccess`` ãã¡ã¤ã«ãå©ç¨ãããã¨ã§ããã¨ãã°ãä»»æã® ``host`` ã«å¯¾ã㦠(``user, realm, password``) ãããã¤ãå®ç¾©ãããã¨ãå¯è½ã§ãã ã§ãã®ã§æ¬å½ã«å¿ è¦ãªã®ã¯ (``user``, ``password``, ``host``, ``path``)ã§ãã ``realm`` ã¯å®ç¾©ã§èæ ®ããã¾ããããbzrã«ãã¹ã¯ã¼ããå¬ä¿ãããå ´å表示ããã¾ãã ``HTTP proxy`` ã¯é©åãªãã¼ããæå®ãããã¨ã§ ``HTTP`` (ããã㯠``HTTPS``) ã¨ãã¦æ±ããã¨ãã§ãã¾ãã ãã¹ã¦ã®ã¹ãã¼ã ãèæ ®ããã«ã¯ããã¹ã¯ã¼ãã¯èªè¨¼å®ç¾©ã®ä¸å¼ (``scheme``, ``host``, ``port``, ``path``, ``user``, ``password``) ããæ¨å®ããã¾ãã * ``scheme``: 空ã«ã§ãã¾ã (å®ç¾©ã®æ®ãã¯ä»»æã®ã¹ãã¼ã ã«å¯¾ãã¦ä½¿ç¨ã§ãããã¨ãæå³ãã)ã ``SFTP`` 㨠``bzr+ssh`` ã¯ããã§ã¯ä½¿ãã¹ãã§ã¯ããã¾ããã 代ããã« ``ssh`` ã使ãããã¹ãã§ãããããèªè¨¼ã«é¢ãã¦æ¬å½ã®ã¹ãã¼ã ã ããã§ãã * ``host``: 空ã«ã§ãã¾ã (ãã¹ãç¨ã®ããã©ã«ãã¨ãã¦æ¯ãèã), * ``port`` ã¯ç©ºã«ã§ãã¾ã (ãã¹ããåãã¹ãã¼ã ã«å¯¾ãã¦ããã¤ãã®ãµã¼ãã¼ãæä¾ããã¨ãã«ä¾¿å©)ã æ°å¤ã®å¤ã®ã¿ã許å¯ããããµã¼ãã¼ãã¹ãã¼ã ã®æ¨æºãã¼ãã¨ã¯ç°ãªããã¼ãã使ç¨ããã¨ãã®ã¿ã«ããã¯ä½¿ç¨ããã¾ãã * ``path``: 空ã«ã§ãã¾ã (FTPãããã¯SFTPã¯ããã使ç¨ãã¾ãã), * ``user``: 空ã«ã§ãã¾ã (ããã©ã«ãã§ã¯ ``bzr`` ã¯pythonã® ``getpass.get_user()`` ã使ç¨), * ``password``: 常ã«ãã¹ã¯ã¼ããããã³ããã§å ¥åããæ¹ãæã¾ããã®ã§ããã°ç©ºã«ã§ãã¾ãã ä»»æã®URLã«å¯¾ãã¦ãè¤æ°ã®å®ç¾©ãæä¾ã§ãã¾ãã bzrã¯æ¬¡ã®ã«ã¼ã«ã«å¾ã£ã¦ (``user`` [, ``password``]) ãé¸æãã¾ã: 1. æåã«ããããããã®ãåªå ããã 2. ãã¹ã¦ã«ããããã空ã®ãã£ã¼ã«ã 3. ãã³ã¬ã¼ã¿ããªã¯ã¨ã¹ããããURLã«ä½¿ç¨ããã¦ãã¦ã ``scheme`` ã¯ããããã¾ãã 4. ``host`` ã¯æ£ç¢ºã«ãããããã '.' ã§å§ã¾ãå ´åããã¡ã¤ã³ã¨ãã¦ãµãã¾ãã¾ãã (``project.bzr.sf.net`` 㯠``.bzr.sf.net`` ã«ããããã¾ãã ``projectbzr.sf.net`` 㯠``bzr.sf.net`` ã«ãããããªã)ã 5. ``port`` ã¯ãªã¯ã¨ã¹ããããURLã«å«ã¾ããå ´å(æ£ç¢ºã«ãããããå ´åã®ã¿)ããããã¾ãã 6. ``path`` ã¯ãªã¯ã¨ã¹ããããURLã«å«ã¾ããå ´åããããã¾ã (ããã¦ä¸è¨ã®ã«ã¼ã« #2 ã«ãã£ã¦ã 空ã®ãã¹ã¯ä»»æã®æä¾ããããã¹ã«ããããã¾ã)ã ãã¡ã¤ã«ã®ãã©ã¼ããã ---------------------- `è¨å®ãã¡ã¤ã«`_ ç¨ã®ä¸è¬ã«ã¼ã«ã¯å¤æ°ããªã·ã¼æå¤ã«å½ã¦ã¯ã¾ãã¾ãã .. _è¨å®ãã¡ã¤ã«: #configuration-settings ããããã®ã»ã¯ã·ã§ã³ã§èªè¨¼ã®å®ç¾©ãè¨è¿°ãã¾ãã ã»ã¯ã·ã§ã³ã®ååã¯ä»»æã®æååã§ã ``DEFAULT`` ã®å¤ã®ã¿ãä¿åãã *æå¾* ã®ã»ã¯ã·ã§ã³ã¨ãã¦ç¾ãã¾ãã ããããã®ã»ã¯ã·ã§ã³ã¯æ¬¡ã®å 容ãå®ç¾©ãã¹ãã§ã: * ``user``: 使ç¨ããããã°ã¤ã³å ããããã®ã»ã¯ã·ã§ã³ã¯æ¬¡ã®å 容ãå®ç¾©ã§ãã¾ã: * ``host``: ãªã¢ã¼ããµã¼ãã¼ * ``port``: ãµã¼ãã¼ããªã¹ã³ãã¦ãããã¼ãçªå· * ``path``: ãã©ã³ãã®ä½ç½® * ``password``: ãã¹ã¯ã¼ã ä¾ --- å¤é¨ã§ãã¹ããããå人ããã¸ã§ã¯ã ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ãã¹ã¦ã®æ¥ç¶ã¯åã ``user`` ã§è¡ãã (ããã©ã«ãã®bzrã®ãã®ãé©åã§ãªãå ´åã®ããã®ãªã¢ã¼ãã®æ¥ç¶) ãã¹ã¯ã¼ãã¯ããã¤ãã®ä¾å¤ã¨ã¨ãã«å¸¸ã«å¬ä¿ããã¾ã:: # hobby.netã®Petããã¸ã§ã¯ã [hobby] host=r.hobby.net user=jim password=obvious1234 # ãã¼ã ãµã¼ãã¼ [home] scheme=https host=home.net user=joe password=1essobV10us [DEFAULT] # ãã¼ã«ã«ã¦ã¼ã¶ã¼ãbarbazã§ããã¹ã¦ã®ãªã¢ã¼ããµã¤ãä¸ã§ã¯foobarã¨ã㦠user=foobar ã½ã¼ã¹ãã¹ãã£ã³ã°ãããã¤ã ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ shp.net(ä»®æ³)ãã¡ã¤ã³ã«ããã¦ãããããã®ããã¸ã§ã¯ãã¯ç¬èªã®ãµã¤ããæã¡ã¾ã:: [shpnet domain] # sftpã使ç¨ããããsshã¯èªè¨¼ç¨ã«ä½¿ç¨ããã scheme=ssh # '.' 㯠'shp.net' ã ãããããããªããã¨ãä¿è¨¼ãã host=.shp.net user=joe # bzrã¯sftpç¨ã®ãã¹ã¯ã¼ãã®æä¾ãä¿è¨¼ãã¾ãã # ãã¹ã¯ã¼ããã¤ã³ã¿ã©ã¯ãã£ãã«å ¥åããããªããã° # sshã¨ã¼ã¸ã§ã³ãã使ç¨ãããã¨ãèãã¦ãã ãã(pageant, ssh-agentããªã©) HTTPSãSFTPãµã¼ãã¼ã¨ãããã· ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ company.comã«ããã¦ããµã¼ãã¼ã®ãã¹ãã£ã³ã°ãªãªã¼ã¹ã¯çµ±åãã©ã³ãã®èå¾ã«ã¯ãããã·ãããã 2ã¤ã®ãã©ã³ãã¯ç°ãªãèªè¨¼ããªã·ã¼ã使ç¨ãã¾ã:: [reference code] scheme=https host=dev.company.com path=/dev user=user1 password=pass1 # devãµã¼ãã¼ä¸ã®éçºãã©ã³ã [dev] scheme=ssh # bzr+sshã¨sftpã¯ããã§å©ç¨å¯è½ host=dev.company.com path=/dev/integration user=user2 # ãããã· [proxy] scheme=http host=proxy.company.com port=3128 user=proxyuser1 password=proxypass1 è¨ç»çãªå¼·å ------------- 次ã®å 容ã¯ã¾ã å®è£ ããã¦ãã¾ãããé²è¡ä¸ã®ä½æ¥ã®ä¸é¨ã¨ãã¦è¨ç»ããã¦ãã¾ã: * ``password_encoding`` ãã£ã¼ã«ãã®è¿½å ã¯æ¬¡ã®ã¨ããã§ã: - ãã¾ãã¾ãªé£èªåã®ã¨ã³ã³ã¼ãã£ã³ã°(ãã¨ãã°base64)ã§ãã¹ã¯ã¼ããä¿åããã - ãã¹ã¯ã¼ãã®ä¿åããã©ã°ã¤ã³ã«å§è²ãã(ãã¨ãã°.netrc)ã * ã¦ã¼ã¶ã¼ãã¦ã¼ã¶ã¼åãããã¯ãã¹ã¯ã¼ãã®å ¥åãå¬ä¿ããããã¯ã¬ãã³ã·ã£ã«ãæ´æ°ããã * ``HTTPS`` ç¨ã« ``verify_certificates`` ãã£ã¼ã«ãã追å ããã ``password_encoding`` 㨠``verify_certificates`` ãã£ã¼ã«ãã¯èªèããã¾ãã å®éã®å®è£ ã§ã¯ç¡è¦ããã¾ãã ãã°ãã©ãã«ã¼ã®è¨å® ===================== ã³ããããè¡ãã¨ãããã®å¤æ´ã«ãã£ã¦ä¿®æ£ããããã°ã«é¢ããã¡ã¿ãã¼ã¿ã¯ --fixes ãªãã·ã§ã³ã使ç¨ãããã¨ã§è¨é²ããã¾ãã ããããã®ãã°ãä¿®æ£ããããã®ã¨ãã¦ãã¼ã¯ãããããã«ãã¨ã³ããªã¼ã '<url> <status>' ãè¿°ã¹ã 'bugs' ãªãã¸ã§ã³ããããã£ã«å«ã¾ãã¾ãã (ç¾å¨ãµãã¼ãããã ``status`` ã®å¤ã¯ ``fixed.`` ã ãã§ã) Launchpadã®ä¸å¿ãã°ãã©ãã«ã¼ç¨ã®ãµãã¼ãã¯çµã¿è¾¼ã¾ãã¦ãã¾ãã ä»ã®ãã°ãã©ãã«ã¼ã«é¢ãã¦ãæ£ããURLãè¨é²ãããããã«è¨å®ãäºãè¦æ±ããã¾ãã Launchpadã«å ãã¦ãBazaarã¯Bugzillaã¨Tracã«é©åãªURLã®çæãç´æ¥ãµãã¼ããã¾ãã ããã¸ã§ã¯ããç°ãªããã°ãã©ãã«ã¼ã使ç¨ããã®ã§ããã°ããã®ãµãã¼ãã追å ããã®ã¯ç°¡åã§ãã Bugzillaãããã¯Tracã使ç¨ãã¦ããã®ã§ããã°ã ãã°ãã©ãã«ã¼ã®åºåºURLãæ ¼ç´ããè¨å®å¤æ°ãè¨å®ãããã¨ã ããå¿ è¦ã§ãã ãããã®ãªãã·ã§ã³ã¯ ``bazaar.conf`` ã ``branch.conf`` ããã㯠``locations.conf`` ã®ãã©ã³ãåºæã®ã»ã¯ã·ã§ã³ã«å ¥ãã¾ãã åãçµãããã¸ã§ã¯ããã¨ã«ãããã®å¤ãã»ããã¢ããã§ãã¾ãã 注: ããããã®ãã©ãã«ã¼ã«å¯¾ãã¦ç縮åãæä¾ããã®ã§ããã°ãæãã®ã§ããã°ã³ãããæã«1ã¤ãããã¯è¤æ°ã®ãã©ãã«ã¼ã§1ã¤ãããã¯è¤æ°ã®ãã°ãæå®ã§ãã¾ãã Launchpad --------- ãã°2ãä¿®æ£ããã³ããããè¨é²ããã«ã¯ ``bzr commit --fixes lp:2`` ã使ç¨ãã¾ãã bugzilla_<tracker_abbreviation>_url ----------------------------------- åå¨ããã®ã§ããã°ãBugzillaã®ãã°ãã©ãã«ã¼ã®ä½ç½®ã¯ <tracker_abbreviation> ã«ãã£ã¦åç §ããã¾ãã ãã®ãã°ãã©ãã«ã¼ã®ãã°ããã®ã³ãããã§ä¿®æ£ããããã®ã¨ãã¦ãã¼ã¯ããããã«ã¯ãã®ãªãã·ã§ã³ã¯ ``bzr commit --fixes`` ã¨ä¸ç·ã«ä½¿ç¨ã§ãã¾ã:: bugzilla_squid_url = http://www.squid-cache.org/bugs ä¸è¨ã®ä¾ã¯Squidã®ãã° 1234ãä¿®æ£ããããã®ã¨ãã¦ãã¼ã¯ããããã« ``bzr commit --fixes squid:1234`` ã許å¯ãã¾ãã trac_<tracker_abbrevation>_url ------------------------------ åå¨ããã®ã§ããã°ãTracã¤ã³ã¹ã¿ã³ã¹ã®ä½ç½®ã¯ <tracker_abbreviation> ã«ãã£ã¦åç §ããã¾ãã ãã®ã³ãããã«ãã£ã¦ãã°ãä¿®æ£ããããã®ã¨ãã¦ãã®ãã©ãã«ã¼ã®ä¸ã§ãã¼ã¯ããããã«ãã®ãªãã·ã§ã³ã¯ ``bzr commit --fixes`` ã¨ä¸ç·ã«ä½¿ç¨ã§ãã¾ã:: trac_twisted_url = http://www.twistedmatrix.com/trac ä¸è¨ã®ä¾ã¯Twistedã®ãã°1234ãä¿®æ£ãããã®ã¨ãã¦ãã¼ã¯ããããã« ``bzr commit --fixes twisted:1234`` ã許å¯ãã¾ãã bugtracker_<tracker_abbrevation>_url ------------------------------------ åå¨ããã®ã§ããã°ãä¸è¬çãªãã°ãã©ãã«ã¼ã®ã¤ã³ã¹ã¿ã³ã¹ã®ä½ç½®ã¯ <tracker_abbreviation> ã«ãã£ã¦åç §ããã¾ãã ä½ç½®ã¯ ``{id}`` ãã¬ã¼ã¹ãã«ãã¼ãå«ã¾ãªããã°ãªãã¾ããããã¬ã¼ã¹ãã«ãã¼ã¯ç¹å®ã®ãã°IDã«ç½®ãæãããã¾ãã ãã®ã³ãããã«ãã£ã¦ãã°ãä¿®æ£ããããã®ã¨ãã¦ãã®ãã©ãã«ã¼ã§ãã¼ã¯ããããã«ãã®ãªãã·ã§ã³ã ``bzr commit --fixes`` ã¨ä¸ç·ã«ä½¿ç¨ã§ãã¾ã:: bugtracker_python_url = http://bugs.python.org/issue{id} ä¸è¨ã®ä¾ã¯Pythonã®Roundupãã°ãã©ãã«ã¼ã®ãã°1234ãä¿®æ£ããããã®ã¨ãã¦ãã¼ã¯ããããã« ``bzr commit --fixes python:1234`` ã許å¯ãã¾ã:: bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id} ä¸è¨ã¯CPANã®RTãã°ãã©ãã«ã¼ç¨ã§ãã .. _configuration-settings: æ§æè¨å® ========= .. TODO: Should have some explanation of why you'd want things in .. branch.conf. ç°å¢å¤æ°ã®è¨å® --------------- 大æµã®è¨å®ãè¨å®ãã¡ã¤ã«ã«ãã£ã¦åãæ±ãããä¸æ¹ã§ã åæ°¸ä¹ çãªããã¤ãã®ãªãã·ã§ã³ã¯ç°å¢å¤æ°ãéãã¦å¶å¾¡ã§ãã¾ãã BZR_EMAIL ~~~~~~~~~ Bazaarã«ãã£ã¦ä½¿ç¨ãããEã¡ã¼ã«ã®IDãä¸æ¸ãããããããããã©ã¼ããã:: "John Doe <jdoe@example.com>" ``email`` ã®è¨å®å¤ãåç §ãã¦ãã ããã BZR_PROGRESS_BAR ~~~~~~~~~~~~~~~~ é²è¡ç¶æ³ã®è¡¨ç¤ºæ¹æ³ãä¸æ¸ããããå¯è½ãªå¤ã¯ "none"ã "dots"ã "tty" BZR_SIGQUIT_PDB ~~~~~~~~~~~~~~~ SIGQUITãé常ã¨ããã«æ¯ãèãããã«ããããããã¯ãã¬ã¼ã¯ã¤ã³ãããã¬ã¼ãèµ·åãããã©ããå¶å¾¡ããã * 0 = æ¨æºã®SIGQUITã®ãµãã¾ã(é常ã¯ã³ã¢ãã³ããä¼´ã£ã¦exitãã) * 1 = ãã¬ã¼ã¯ã¤ã³ãããã¬ã¼ãèµ·åãã (ããã©ã«ã) BZR_HOME ~~~~~~~~ Bazaarã«ãã£ã¦ä½¿ç¨ããããã¼ã ãã£ã¬ã¯ããªãä¸æ¸ããã BZR_SSH ~~~~~~~ ç°ãªãSSHã®å®è£ ãé¸æããã BZR_PDB ~~~~~~~ ãããã¬ãããã¯ã¨ã©ã¼ãç«ã¡ä¸ãããå¶å¾¡ããã * 0 = Standard behavior * 1 = Launch debugger BZR_REMOTE_PATH ~~~~~~~~~~~~~~~ bzr+sshãããã³ã«ã使ç¨ããéã«ä½¿ç¨ããBazaarå®è¡ãã¡ã¤ã«ã¸ã®ãã¹ã è¨å®å¤ ``bzr_remote_path`` ãåç §ã BZR_EDITOR ~~~~~~~~~~ ã³ãããã¡ãã»ã¼ã¸ãªã©ã®éã«Bazaarã使ç¨ããã¨ãã£ã¿ã¸ã®ãã¹ã BZR_PLUGIN_PATH ~~~~~~~~~~~~~~~ Bazaarã使ç¨ãããã©ã°ã¤ã³ãã£ã¬ã¯ããªã¸ã®ãã¹ã BZRPATH ~~~~~~~ Bazaarãã·ã§ã«ã·ã§ã«ãã©ã°ã¤ã³ã®å¤é¨ã³ãã³ããæ¢ããã¹ã è¨å®ãã¡ã¤ã« ------------- è¨ç½®å ´æ ~~~~~~~~~ è¨å®ãã¡ã¤ã«ã¯Linux/Unixã®å ´å ``$HOME/.bazaar`` ã« Windowsã®å ´å ``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0`` ã«è¨ç½®ããã¾ãã ( ``bzr version`` ã使ç¨ãããã¨ã§ã·ã¹ãã ã«è¨ç½®ãããä½ç½®ããã§ãã¯ã§ãã¾ã) ãã®ä½ç½®ã«3ã¤ã®ä¸»è¦ãªè¨å®ãã¡ã¤ã«ãåå¨ãã¾ã: * ``bazaar.conf`` ã¯ããã©ã«ãã®è¨å®ãªãã·ã§ã³ãè¨è¿°ãã¾ã * ``locations.conf`` ã¯ç¹å®ã®ãã©ã³ãã®ä½ç½®ç¨ã®è¨å®æ å ±ãè¨è¿°ãã¾ãã * ``authentication.conf`` ã¯ãªã¢ã¼ããµã¼ãã¼ç¨ã®ã¯ã¬ãã³ã·ã£ã«æ å ±ãè¨è¿°ãã¾ãã ããããã®ãã©ã³ãã¯ãã®ãã©ã³ãã«åºæãªå¤ãè¨å®ããè¨å®ãã¡ã¤ã«ãæ ¼ç´ãã¾ãã ãã®ãã¡ã¤ã«ã¯ãã©ã³ãã®ç¯å²å ã® ``.bzr/branch/branch.conf`` ã§è¦ã¤ããã¾ãã ãã®ãã¡ã¤ã«ã¯ãã©ã³ãã®ãã¹ã¦ã®ã¦ã¼ã¶ã¼ã«è¦ãã¾ãã ããªãã®ãã©ã³ãå°ç¨ã«è¨å®å¤ã®1ã¤ãä¸æ¸ããããã®ã§ããã°ã ``locations.conf`` ã§è¡ããã¨ãã§ãã¾ãã ä¸è¬çãªãã©ã¼ããã ~~~~~~~~~~~~~~~~~~~~ iniãã¡ã¤ã«ã¯3ã¤ã®ç¨®é¡ã®ã³ã³ãã©ã¯ã: ã»ã¯ã·ã§ã³ãããã¼ãã»ã¯ã·ã§ã³å¤æ°ã¨ã³ã¡ã³ããæã¡ã¾ãã ã³ã¡ã³ã ^^^^^^^^^ ã³ã¡ã³ãè¡ã¯ "#" ã§å§ã¾ãã¾ã("hash mark", "pound sign" "number sign"ã¨ãå¼ã°ãã¾ã)ã ã³ã¡ã³ãè¡ã¯iniãã¡ã¤ã«ã解æããã¨ãBazaarã«ãã£ã¦ç¡è¦ããã¾ãã ã»ã¯ã·ã§ã³ãããã¼ ^^^^^^^^^^^^^^^~~~~ ã»ã¯ã·ã§ã³ãããã¼ã¯è¡é ããå§ã¾ãè§ãã£ãã§å²ã¾ããåèªã§ãã å ¸åçãªã»ã¯ã·ã§ã³ãããã¼ã¯æ¬¡ã®ã¨ããã§ã:: [DEFAULT] bazaar.confã«å¯¾ãã¦ç¾æç¹ã§å¯ä¸æå¹ãªã»ã¯ã·ã§ã³ãããã¼ã¯[DEFAULT]ã¨[ALIASES]ã§ãã ã»ã¯ã·ã§ã³ãããã¼ã¯å¤§æåã¨å°æåãåºå¥ãã¾ãã ããã©ã«ãã®ã»ã¯ã·ã§ã³ãæä¾ããè¨å®å¤æ°ã¯ãã©ã³ãã®è¨å®ãã¡ã¤ã«ã§ä¸æ¸ãã§ãã¾ãã ``locations.conf`` ã«å¯¾ãã¦ã ã»ã¯ã·ã§ã³ã«ãããããæé·ã®ãã®ãæã¤ã»ã¯ã·ã§ã³ããã®å¤æ°ã¯æ½å¨çã«æå¹ãªå¥ã®ã»ã¯ã·ã§ã³ãããã¼ãé¤å¤ããããã«ä½¿ããã¾ãã ã»ã¯ã·ã§ã³ãããã¼ã¯ãã©ã³ãç¨ã®ãã¹ãã»ã¯ã·ã§ã³ãããã¼ã¨ãã¦ä½¿ç¨ãã¾ãã次ã®ãããªä¾ãããã¾ã:: [http://mybranches.isp.com/~jdoe/branchdir] [/home/jdoe/branches/] ã»ã¯ã·ã§ã³å¤æ° ^^^^^^^^^^^^^^^ ã»ã¯ã·ã§ã³å¤æ°ã¯ã»ã¯ã·ã§ã³ã®ç¯å²ã«å±ãã¾ããã»ã¯ã·ã§ã³å¤æ°ã¯å¤æ°åãçå·ã¨å¤ãæ ¼ç´ãã¾ããä¾ã§ã:: email = John Doe <jdoe@isp.com> check_signatures = require å¤æ°ã®ããªã·ã¼ ^^^^^^^^^^^^^^^ ã»ã¯ã·ã§ã³ã®ä¸ã§å®ç¾©ãããå¤æ°ã¯ååã¤ãã®ãã£ã¬ã¯ããªãããã¯URLã«å ãã¦ããããæ ¼ç´ããä½ç½®ã«ãå½±é¿ãä¸ãã¾ãã ããªã·ã¼ã¯å¯å¤å¤æ°ãå«ã¾ããä½ç½®ã®ããã«è§£éãããæ¹æ³ãå¤æ´ããããã«ä½¿ç¨ã§ãã¾ããç¾å¨ã¯3ã¤ã®ããªã·ã¼ãå©ç¨ã§ãã¾ã: none: å¤ã¯å«ã¾ããä½ç½®ã«å¯¾ãã¦åãããã«è§£éããã¾ãã ããã¯ããã©ã«ãã®ãµãã¾ãã§ãã norecurse: å¤ã¯ã»ã¯ã·ã§ã³åã«ãã£ã¦æå®ãããæ£ç¢ºãªä½ç½®ã®ã¿ã«å¯¾ãã¦ä½¿ç¨ããã¾ãã appendpath: for contained locations, 追å ãã¹ã®ã³ã³ãã¼ãã³ãã¯å¤ã«è¿½å ããã¾ãã ããªã·ã¼ã¯ "$var:policy" å½¢å¼ã®ååãæã¤ãã¼ã«ãã£ã¦æå®ããã¾ãã ãã¨ãã°ããã©ã³ãã®ããªã¼ç¨ã®pushã®ä½ç½®ãå®ç¾©ããã«ã¯ã次ã®è¨å®ã使ããã¾ã:: [/top/location] push_location = sftp://example.com/location push_location:policy = appendpath ãã®è¨å®ã«ãã£ã¦ã ``/top/location/branch1`` ç¨ã®pushä½ç½®ã¯ ``sftp://example.com/location/branch1`` ã«ãªãã¾ãã 主è¦ãªè¨å®ãã¡ã¤ã«ã®bazaar.conf ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``bazaar.conf`` 㯠``[DEFAULT]`` ã¨å¼ã°ãã1ã¤ã®ã»ã¯ã·ã§ã³ã ãã許å¯ãã¾ãã ãã®ããã©ã«ãã»ã¯ã·ã§ã³ã¯ãã¹ã¦ã®ãã©ã³ãç¨ã®ããã©ã«ãè¨å®ãªãã·ã§ã³ãæ ¼ç´ãã¾ãã ããã©ã«ãã»ã¯ã·ã§ã³ã¯ ``locations.conf`` ã«ãã©ã³ãåºæã®ã»ã¯ã·ã§ã³ãæä¾ãããã¨ã§ä¸æ¸ãã§ãã¾ãã å ¸åç㪠``bazaar.conf`` ã»ã¯ã·ã§ã³ã¯æ¬¡ã®ããã«ãªãã¾ã:: [DEFAULT] email = John Doe <jdoe@isp.com> editor = /usr/bin/vim check_signatures = check-available create_signatures = when-required ãã©ã³ãã®ä½ç½®ã®è¨å®ãã¡ã¤ã«ã®locations.conf ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``locations.conf`` ã«ãã£ã¦ç¹å®ã®ãã©ã³ãç¨ã«è¨å®ãä¸æ¸ãã§ãã¾ãã ãã©ã¼ãããã¯1ã¤ã®é大ãªå¤æ´ãä¼´ãbazaar.confã®ããã©ã«ãã»ã¯ã·ã§ã³ã«å¯¾ãã¦ã»ã¨ãã©çæ³çã§ã: ããã©ã«ããè¨è¿°ãã代ããã«ãã»ã¯ã·ã§ã³ãããã¼ã¯å¤ãä¸æ¸ãããããã©ã³ãã¸ã®ãã¹ã«ãªãã¾ãã ã¯ã¤ã«ãã«ã¼ãã® '?' 㨠'*' ããµãã¼ãããã¾ã:: [/home/jdoe/branches/nethack] email = Nethack Admin <nethack@nethack.com> [http://hypothetical.site.com/branches/devel-branch] create_signatures = always check_signatures = always [http://bazaar-vcs.org/bzr/*] check_signatures = require èªè¨¼ç¨ã®è¨å®ãã¡ã¤ã«ãauthentication.conf ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``authentication.conf`` ã«ãã£ã¦ãªã¢ã¼ããµã¼ãã¼ç¨ã®ã¯ã¬ãã³ã·ã£ã«ãæå®ã§ãã¾ãã ããã¯ãã¹ã¦ã®ãµãã¼ãããã転éã¨èªè¨¼(ãã¨ãã°smtp)ãå¿ è¦ã¨ããbzrã®ä¸é¨ã«å¯¾ãã¦ä½¿ç¨ã§ãã¾ãã ãã¡ã¤ã«ã®æ§æã¯é©ç¨ããªãå¤æ°ããªã·ã¼ç¨ã®ä»ã®ä¾å¤ãé¤ãã¦åãã«ã¼ã«ã«å¾ãã¾ãã è¨å®ãã¡ã¤ã«ã«ãããèªè¨¼ã®ä½¿ãæ¹ã®è©³ç´°ãªæ å ±ã«é¢ãã¦ã¯ `èªè¨¼ã®è¨å®`_ ãåç §ãã¦ãã ããã å¤æ°ã®å ±éãªãã·ã§ã³ --------------------- email ~~~~~ Eã¡ã¼ã«ã¢ãã¬ã¹ã¯ãã©ã³ããã³ãããããéã«ä½¿ããã¾ãããã次ã®ãããªå½¢å¼ãã¨ãã¾ã:: email = Full Name <account@hostname.tld> editor ~~~~~~ ã³ãããã¡ãã»ã¼ã¸ãªã㧠*bzr commit* ãå®è¡ãããå ´åã«ä½¿ç¨ãããã¨ãã£ã¿ã®ãã¹ã§ãã ãã®è¨å®ã¯ç°å¢å¤æ° ``BZR_EDITOR`` ã«ãã£ã¦è¨å®ããã ç°å¢å¤æ° ``VISUAL`` 㨠``EDITOR`` ã«ãã£ã¦ä¸æ¸ãããã¾ãã check_signatures ~~~~~~~~~~~~~~~~ ç½²åç¨ã®ãµãã¾ããå®ç¾©ãã¾ãã require ãªãã¸ã§ã³ç¨ã®gnupgç½²åãåå¨ãã¦æå¹ã§ãªããã°ãªãã¾ããã ignore ãªãã¸ã§ã³ã®gnupgã®ç½²åããã§ãã¯ããªãã check-available (ããã©ã«ã) ãªãã¸ã§ã³ç¨ã®gnupgã®ç½²åãåå¨ããå ´åããããããã§ãã¯ãã¾ãã ãããç½²åã§ãããã¨ãåããã¨Bazaarã¯å¤±æãã¾ãããç½²åãåå¨ããªãå ´åã¯å¤±æãã¾ããã create_signatures ~~~~~~~~~~~~~~~~~ ãªãã¸ã§ã³ç½²åã®ãµãã¾ããå®ç¾©ãã¾ãã always ã³ãããããããã¹ã¦ã®æ°ãããªãã¸ã§ã³ã«ç½²åããã when-required (ããã©ã«ã) ãã©ã³ããç½²åã¤ãã®ãªãã¸ã§ã³ãè¦æ±ããã¨ãã®ã¿æ°ããã³ãããããããªãã¸ã§ã³ã«ç½²åããã never ãã©ã³ããç½²åãè¦æ±ããå ´åã§ãæ°ããã³ãããããããªãã¸ã§ã³ã«ç½²åããã®ãæå¦ããã recurse ~~~~~~~ ``locations.conf`` ã§ã®ã¿ä¾¿å©ã§ãã ãã®ã»ã¯ã·ã§ã³ç¨ã®è¨å®ããµããã£ã¬ã¯ããªã«ãé©ç¨ãããã©ããå®ç¾©ãã¾ã: true (ããã©ã«ã ãã®ã»ã¯ã·ã§ã³ã¯ãµããã£ã¬ã¯ããªã«ãé©ç¨ãããã false ãã®ã»ã¯ã·ã§ã³ã¯ãã®ãã£ã¬ã¯ããªã®ãã©ã³ãã®ã¿ã«é©ç¨ãããã®ä¸ã®ãã©ã³ãã«ã¯é©ç¨ãããªãã gpg_signing_command ~~~~~~~~~~~~~~~~~~~ (ããã©ã«ã: "gpg"). ãªãã¸ã§ã³ã®ç½²åã¨ãã§ãã¯ã®ããã«ä½¿ç¨ãããããã°ã©ã ãä¾ã§ã:: gpg_signing_command = /usr/bin/gnpg bzr_remote_path ~~~~~~~~~~~~~~~ (ããã©ã«ã: "bzr"). bzrç¨ã®ã¹ãã¼ããµã¼ãã¼ã稼åãããããã«ä½¿ãããã³ãã³ãã¸ã®ãã¹ã ãã®å¤ã¯locations.confã§ã®ã¿æå®ã許å¯ããã¾ããçç±ã¯æ¬¡ã®ã¨ããã§ã: - branch.confãã¢ã¯ã»ã¹ã§ããåã«å¿ è¦ã ãã - ã»ãã¥ãªãã£ãªã¹ã¯ã«ãªãã³ãã³ããæå®ããããã«ãªã¢ã¼ãã®branch.confãã¡ã¤ã«ã許å¯ãããã ããã¯BZR_REMOTE_PATH ç°å¢å¤æ°ã«ãã£ã¦ä¸æ¸ãããã¾ãã smtp_server ~~~~~~~~~~~ (ããã©ã«ã: "localhost")ããã¨ãã° ``merge-directive --mail-to`` ããããã¯bzr-emailãã©ã°ã¤ã³ã«ãã£ã¦ BazaarãEã¡ã¼ã«ãéä¿¡ããå¿ è¦ãããã¨ãã«ä½¿ç¨ããSMTPãµã¼ãã¼ã smtp_username, smtp_password ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SMTPãµã¼ãã¼ã§èªè¨¼ããã¦ã¼ã¶ã¼ã¨ãã¹ã¯ã¼ãã smtp_usernameãè¨å®ããã¦ãã¦ãsmtp_passwordãè¨å®ããã¦ããªããã°ãBazaarã¯ãã¹ã¯ã¼ããå¬ä¿ãã¾ãã Eã¡ã¼ã«ãéä¿¡ããããã«SMTPãµã¼ãã¼ãèªè¨¼ãå¿ è¦ã¨ããå ´åã®ã¿ãããã®è¨å®ãå¿ è¦ã§ãã mail_client ~~~~~~~~~~~ ãã¼ã¸ãªã¯ã¨ã¹ããéä¿¡ããããã«ä½¿ãã¡ã¼ã«ã¯ã©ã¤ã¢ã³ãã ããã©ã«ãã§ã¯ãWindowsã§ã¯bzr㯠``mapi`` ã使ããã¨ã試ã¿ã¾ãã ä»ã®ãã©ãããã©ã¼ã ã§ã¯ã ``xdg-email`` ã試ã¿ã¾ãã ãããã®ã©ã¡ããã失æããã¨ã ``editor`` ã«æ»ãã¾ãã ç¹å®ã®ã¯ã©ã¤ã¢ã³ãç¨ã®ãµãã¼ããããå¤: :claws: Clawsã使ç¨ããããã¡ã¤ã«æ·»ä»ã®ãã¤ã¢ãã°ã¯ã¹ãããããã :evolution: Evolutionã使ç¨ãã :kmail: KMailã使ç¨ãã :mutt: Muttã使ç¨ãã :thunderbird: Mozilla Thunderbirdãããã¯Icedoveã使ç¨ãããThunderbird/Icedove 1.5ã«é¢ãã¦ã ããã¯xdg-emailãæ±ããªãããã¤ãã®ãã°ã«å¯¾å¦ãã¾ãã ãµãã¼ããããä¸è¬çãªå¤ã¯æ¬¡ã®ã¨ããã§ã: :default: ä¸è¨ãåç §ã :editor: ãã¼ã¸ãªã¯ã¨ã¹ããæ¸ãã¨ãã£ã¿ã使ç¨ãã¾ãã ããã¯ã³ãããID( ``bzr whoami`` ãåç §), smtp_serverã¨(ãªãã·ã§ã³ã§)smtp_usernameã¨smtp_passwordã使ç¨ãã¾ãã :mapi: Windowsã§å¥½ããªã¡ã¼ã«ã¯ã©ã¤ã¢ã³ãã使ç¨ãã¾ãã :xdg-email: 好ããªã¡ã¼ã«ãã©ã°ã©ã ãå®è¡ããããã«xdg-emailã使ç¨ãã submit_branch ~~~~~~~~~~~~~ ç¾å¨ã®ä½æ¥å 容ãæ稿ãããã¨ãã¦ãããã©ã³ãã ãã㯠``bzr send`` ã«ãã£ã¦èªåçã«è¨å®ãã ``submit:`` ãªãã¸ã§ã³ã¹ããã¯ã«ã使ç¨ããã¾ãã é常ãããã¯ãã©ã³ãåä½ãã±ã¼ã·ã§ã³åä½ã§è¨å®ããã¾ãã public_branch ~~~~~~~~~~~~~ ãã®ãã©ã³ãã®å ¬éããã¢ã¯ã»ã¹å¯è½ãªãã¼ã¸ã§ã³ (ãã®ãã©ã³ããå ¬éããã¦ã¢ã¯ã»ã¹å¯è½ã§ã¯ãªããã¨ãæ示ãã)ã ``bzr send`` ã«ãã£ã¦ä½¿ç¨ããã¾ã(ããã¦è¨å®ããã¾ã)ã ãã©ã³ãç¹æã®ãªãã·ã§ã³ ------------------------- ãããã®ãªãã·ã§ã³ã¯ ``dirstate-tags`` ãããã¯å¾ã®ãã©ã¼ãããã使ç¨ãããã©ã³ãã«ã®ã¿é©ç¨ãã¾ãã é常ãããã¯èªåçã« ``.bzr/branch/branch.conf`` è¨å®ããã ãããã¯æå㧠``locations.conf`` ããã㯠``bazaar.conf`` ã«è¨å®ããã¾ãã append_revisions_only ~~~~~~~~~~~~~~~~~~~~~ "True"ã«è¨å®ããã¦ããã°ãªãã¸ã§ã³ã¯ãã°ã«ã®ã¿è¿½å ãããåé¤ããã¾ããã ãã®è¨å®ãæå¹ãªãã©ã³ãã¯ãä»ã®ãã©ã³ãã®ãã°ãããèªèº«ã®ãªãã¸ã§ã³ããé·ãå ´åãå¥ã®ãã©ã³ãããã®ã¿pullã§ãã¾ãã é常ãã㯠``bzr init --append-revisions-only`` ã«ãã£ã¦è¨å®ããã¾ãã parent_location ~~~~~~~~~~~~~~~ åå¨ããã°ãpullãããã¯mergeç¨ã®ããã©ã«ããã©ã³ãã®ä½ç½®ã é常ãã®ãªãã·ã§ã³ã¯ ``pull --remember`` ããã㯠``merge --remember`` ã«ãã£ã¦è¨å®ããã¾ãã push_location ~~~~~~~~~~~~~ åå¨ããã°ãpushç¨ã®ããã©ã«ããã©ã³ãã®ä½ç½®ã é常ãã®ãªãã·ã§ã³ã¯ ``push --remember`` ã«ãã£ã¦è¨å®ããã¾ãã bound_location ~~~~~~~~~~~~~~ ãã§ãã¯ã¢ã¦ãã¨ãã¦æ¯ãèãã¨ãã³ããããåããä½ç½®ã é常ãã®ãªãã·ã§ã³ã¯ ``bind`` ã«ãã£ã¦è¨å®ããã¾ãã bound ~~~~~ "True"ã«è¨å®ããã¦ããã¨ããã©ã³ãã¯ãã§ãã¯ã¢ã¦ãã¨ãã¦ãµãã¾ããbound_locationã«ããããã®ã³ããããpushãã¾ãã é常ãã®ãªãã·ã§ã³ã¯ ``bind``/``unbind`` ã«è¨å®ããã¾ãã è¡çªã®ã¿ã¤ã ============= ãªãã¬ã¼ã·ã§ã³ã®ä¸ã«ã¯ãmergeãrevertã¨pullã®ããã«ãä½æ¥ããªã¼ã®å 容ãä¿®æ£ãããã®ãããã¾ãã ãããã®ä¿®æ£ã¯ããã°ã©ã ã§çæãããã®ã§ãä½æ¥ããªã¼ã®ç¾å¨ã®ç¶æ ã¨è¡çªãããã¨ãããã¾ãã å¤ãã®ç¨®é¡ã®å¤æ´ã¯ããã°ã©ã ã§çµåã§ãã¾ããã æ£ãããã¨ãè¡ããã¦ãããæã 人éã ãããå¤æã§ããªããã¨ãããã¾ãã ãããèµ·ããã¨ã Bazaarã¯ããªãã«è¡çªãåå¨ããã®ã§ããã解æ¶ããããã«ä¼ãã¾ãã Bazaarã«è¡çªã解æ¶ãããã¨ãä¼ããã³ãã³ã㯠``resolve`` ã§ããã ãããå®è¡ã§ããåã«ããã¤ãã®ã¢ã¯ã·ã§ã³ãå®è¡ããªããã°ãªãã¾ããã ããããã®è¡çªã¯ä¸è¨ã®ã»ã¯ã·ã§ã³ã§èª¬æãããè¡çªã解æ¶ããããã«è¡ããªããã°ãªããªãã¢ã¯ã·ã§ã³ã®æ¦è¦ã説æããã¦ãã¾ãã ããã¹ãã®è¡çª --------------- å ¸åçãªã¡ãã»ã¼ã¸ã¯æ¬¡ã®ã¨ããã§ã:: Text conflict in FILE ããã¹ãã®ãã¼ã¸ã2ã¤ã®ã»ããã®ããã¹ãã®å¤æ´ãå®å ¨ã«æãåããã¤ããããªãã¨ãã«ãããã¯çã¿åºããã¾ãã Bazaarã¯THISãOTHERãã¨BASEã®ã¨ã¯ã¹ãã³ã·ã§ã³ã§ããããã®ãã¼ã¸ã§ã³ç¨ã«ãã¡ã¤ã«ãemitãã¾ãã THISã¯ã¿ã¼ã²ããããªã¼ããã®ãã¡ã¤ã«ã®ãã¼ã¸ã§ã³ãããªãã¡ãå¤æ´ããã¼ã¸ãããã¨ãã¦ããããªã¼ã§ãã OTHERã¯ã¿ã¼ã²ããã«ãã¼ã¸ãããã¨ãã¦ãããã¼ã¸ã§ã³ãBASEã¯æ¯è¼ç¨ã®ãã¼ã¹ã¨ãã¦ä½¿ãããå¤ããã¼ã¸ã§ã³ã§ãã ãã¡ã¤ã«ã®ã¡ã¤ã³ã³ãã¼ã«ããã¦ãBazaarã¯èª¿æ´ã§ãããã¹ã¦ã®å¤æ´ãå«ã¿ã æªèª¿æ´ã®è¡çªã¯ ``<<<<<<<`` ã®ããã« "herringbone" ãã¼ã«ã¼ã«ãã£ã¦å²ã¾ãã¾ãã ãã¨ãã°ãåæã®ããã¹ãã "The project leader released it."ãã§THISã¯ããã "Martin Pool released it." ã«ä¿®æ£ããä¸æ¹ã§ã OTHERã¯"The project leader released Bazaar."ã«ä¿®æ£ãã¾ããè¡çªã¯æ¬¡ã®ããã«ãªãã¾ã:: <<<<<<< TREE Martin Pool released it. ======= The project leader released Bazaar. >>>>>>> MERGE-SOURCE æ£ãã解æ¶æ¹æ³ã¯"Martin Pool released Bazaar."ã«ãªãã¾ãã ãã¡ã¤ã«ã®ã¡ã¤ã³ã³ãã¼ãç·¨éããããããã¯THISãOTHERã¨BASEãã¼ã¸ã§ã³ä¸ã§å¤é¨ãã¼ã«ãèµ·åãããã¨ã®ã©ã¡ããã§ããã¹ãã®è¡çªãæ±ããã¨ãã§ãã¾ãã ããã¹ãã®è¡çªã®è§£æ¶ã«ããã¦ä»ã®ãã®ããå¤æ´ã®ã»ããã®1ã¤ã®é¸å¥ã¯ãã£ãã«ãªããã¨ã¯è¨ã£ã¦ãã価å¤ãããã¾ãã ããé »ç¹ã«ã2ã¤ã®ã»ããã®å¤æ´ã¯ã¤ã³ããªã¸ã§ã³ãã«çµåããªããã°ãªãã¾ããã ã¡ã¤ã³ã³ãã¼ãç·¨éããã¨ãã herringbone ãã¼ã«ã¼ãå¿ ãåé¤ãã¦ãã ããã ç·¨éä½æ¥ãçµããã¨ãããã¡ã¤ã«ã¯è¡çªããã£ãã¦èµ·ãããªãããã§ããã°ãã³ãããããæºåãã§ãã¦ãã¾ãã ããã¹ãã®è¡çªã解æ¶ããã¨ãã"bzr resolve"ãå®è¡ããã ãã§Bazaarã¯è§£æ¶ããè¡çªãèªåæ¤åºãã¾ãã å 容ã®è¡çª ---------- å ¸åçãªã¡ãã»ã¼ã¸:: Contents conflict in FILE ã¿ã¼ã²ããããªã¼ã¨ãã¼ã¸ã½ã¼ã¹ã®ä¸ã®å¤æ´ã®è¡çªãåå¨ããã¨ãã«ãã®è¡çªã¯èµ·ããã¾ããã ãè¡çªããã¢ã¤ãã ã¯ããã¹ããã¡ã¤ã«ã§ã¯ããã¾ããã ãããã¯ãã¤ããªãã¡ã¤ã«ãããã¯ã·ã³ããªãã¯ãªã³ã¯ãããã¯ãã£ã¬ã¯ããªã«ãªãã¾ãã çæ¹ãåé¤ãããããä¸æ¹ãä¿®æ£ããããã¡ã¤ã«ã§ãèµ·ããå¾ã¾ãã ããã¹ãã®è¡çªã®ããã«ãBazaarã¯THISãOTHER ã¨BASEãã¡ã¤ã«ãã¨ããããã¾ãã (ãããã¯é常ã®ãã¡ã¤ã«ãã·ã³ããªãã¯ãªã³ã¯ãããã¯ãã£ã¬ã¯ããªã«ãªãã¾ã)ã ããã¯herringboneè¡çªãã¼ã«ã¼ãæã¤ãã¡ã¤ã«ã®"ã¡ã¤ã³ã³ãã¼"ãå«ã¿ã¾ããã "ã¡ã¤ã³ã³ãã¼"ãTHISããã¯OTHERã«ãªãã¼ã ãããã¨ãã«ããã¯ç¾ãã¾ãã ããã解æ¶ããã«ã¯ããã¡ã¤ã«ãé常ã®ååã«æ»ãããã« "bzr mv" ã使ç¨ãå¤æ´ãæåã§çµåãã¾ãã æºè¶³ããã¨ãã«ã "bzr resolve FILE" ãå®è¡ãã¾ãããã®ç¨®ã®è¡çªã解æ¶ãããã¨ãã«Bazaarã¯èªåæ¤åºã§ãã¾ããã éè¤ãããã¹ ------------- å ¸åçãªã¡ãã»ã¼ã¸:: Conflict adding file FILE. Moved existing file to FILE.moved. æã Bazaarã¯ãã§ã«ä½¿ç¨ããã¦ãããã¹åãç¨ãã¦ãã¡ã¤ã«ãä½æãããã¨ãã¾ãã æ¢åã®ãã¡ã¤ã«ã¯ "FILE.moved" ã«ãªãã¼ã ããã¾ãã æãã®ã§ããã°ããããã®ãã¡ã¤ã«ã®1ã¤ããªãã¼ã ãããããããã®å 容ãçµåã§ãã¾ãã æºè¶³ããããè¡çªã解æ¶ãããã®ã¨ãã¦ãã¼ã¯ããããã« "bzr resolve FILE" ãå®è¡ã§ãã¾ãã ãã¼ã¸ã§ã³ç®¡çä¸ã«ãªã親 ------------------------- å ¸åçãªã¡ãã»ã¼ã¸:: Conflict because FILE is not versioned, but has versioned children. ã¨ãã©ãBazaarã¯è¦ªãã£ã¬ã¯ããªããã¼ã¸ã§ã³ç®¡çããã¦ããªããã¡ã¤ã«ãä½æãããã¨ãã¾ãã ã¿ã¼ã²ããã®ä¸ã§ãã£ã¬ã¯ããªãåé¤ãããã¨ãã«ãããèµ·ããã¾ããã ã½ã¼ã¹ã®ä¸ã®æ°ããåãæã¡ã¾ããéãåæ§ã§ãã ãã®ç¶æ³ã«ããã¦ãBazaarã¯è¦ªãã£ã¬ã¯ããªãåæ§ã«ãã¼ã¸ã§ã³ç®¡çãã¾ãã ãã®åé¡ã®è§£æ±ºæ¹æ³ã¯ç¹å®ã®ã·ããªãªã«å¤§ããä¾åãã¾ãã ãã¡ã¤ã«ãããã¯ãã£ã¬ã¯ããªããªãã¼ã ãããã¯åé¤ããã¨ããã§ãããã æºè¶³ããããè¡çªã解æ¶ãããã®ã¨ãã¦"bzr resolve FILE"ãå®è¡ã§ãã¾ãã è¦ã¤ãããªã親 --------------- å ¸åçãªã¡ãã»ã¼ã¸:: Conflict adding files to FILE. Created directory. ã¿ã¼ã²ããã®ä¸ã§ãã¡ã¤ã«ãåé¤ããã¨ãã«ãããèµ·ããã¾ãããã½ã¼ã¹ã®ä¸ã«æ°ããåãããã¾ãã ãã㯠"unversioned parent" ã®è¡çªã¨ä¼¼ã¦ãã¾ãã ãã¼ã¸ã§ã³ç®¡çã解é¤ããã代ããã«ã親ãã£ã¬ã¯ããªã *åå¨ããªã* ãã¨ãé¤ãã¦ã ãã®ç¶æ³ã«ããã¦ãBazaarã¯è¦ã¤ãããªã親ãä½æãã¾ãã ãã®åé¡ã®è§£æ±ºæ¹æ³ã¯ç¹å®ã®ã·ããªãªã«å¤§ãã«ä¾åãã¾ãã ãã¡ã¤ã«ãããã¯ãã£ã¬ã¯ããªããªãã¼ã ãããã¯åé¤ããã¨ããã§ãããã æºè¶³ããããè¡çªã解æ¶ãããã®ã¨ã㦠"bzr resolve FILE" ãå®è¡ã§ãã¾ãã 親ãåé¤ãã ------------ å ¸åçãªã¡ãã»ã¼ã¸:: Conflict: can't delete FILE because it is not empty. Not deleting. ããã¯"è¦ã¤ãããªã親"ã®å対ã§ããã½ã¼ã¹ã®ä¸ã§ãã£ã¬ã¯ããªã¯åé¤ããã¾ããã ã¿ã¼ã²ããã®ä¸ã§æ°ããåã¯ããã¾ããBazaarã¯ãã£ã¬ã¯ããªãä¿æãç¶ãã¾ãã ãã®åé¡ã®è§£æ¶ã¯ç¹å®ã®ã·ããªãªã«å¤§ãã«ä¾åãã¾ãã ãã¡ã¤ã«ãããã¯ãã£ã¬ã¯ããªããªãã¼ã ãããã¯åé¤ããã¨ããã§ãããã æºè¶³ããããè¡çªã解æ¶ãããã®ã¨ãã¦ãã¼ã¯ããããã«"bzr resolve FILE"ãå®è¡ã§ãã¾ãã ãã¹ã®è¡çª ----------- å ¸åçãªã¡ãã»ã¼ã¸:: Path conflict: PATH1 / PATH2 ã½ã¼ã¹ã¨ã¿ã¼ã²ããããã¡ã¤ã«ã®ååãããã¯è¦ªãã£ã¬ã¯ããªãä¿®æ£ããã¨ãã«èµ·ããã¾ãã Bazaarã¯ã½ã¼ã¹ãããã¹è¦ç´ ã使ç¨ãã¾ãã ãã¡ã¤ã«ããªãã¼ã ã§ããã°ãè¡çªã解æ¶ãããã®ã¨ãã¦ãã¼ã¯ããããã« "bzr resolve FILE" ãå®è¡ãã¾ãã 親ã®ã«ã¼ã ----------- å ¸åçãªã¡ãã»ã¼ã¸:: Conflict moving FILE into DIRECTORY. Cancelled move. ã½ã¼ã¹ã¨ã¿ã¼ã²ããããããããã£ã¬ã¯ããªã移åãããã®ã§ã å¤æ´ãé©ç¨å¯è½ã§ããã°ããã£ã¬ã¯ããªã¯ããèªèº«ãå«ãã¨ãã«ããã¯èµ·ããã¾ãã ä¾ã§ã:: $ bzr init $ bzr mkdir a $ bzr mkdir b $ bzr commit -m "BASE" $ bzr branch . ../other $ bzr mv a b $ bzr commit -m "THIS" $ bzr mv ../other/b ../other/a $ bzr commit ../other -m "OTHER" $ bzr merge ../other ãã®ç¶æ³ã«ããã¦ãBazaarã¯ç§»åããã£ã³ã»ã«ãã¦ã"a"ã"b"ã®ä¸ã«æ®ãã¦ããã¾ãã æãã®ã§ããã°ãã£ã¬ã¯ããªããªãã¼ã ã§ããã° è¡çªã解æ¶ãããã®ã¨ãã¦ãã¼ã¯ããããã« "bzr resolve FILE" ãå®è¡ãã¾ãã ãã£ã¬ã¯ããªã§ã¯ãªã親 ----------------------- å ¸åçãªã¡ãã»ã¼ã¸:: Conflict: FILE.new is not a directory, but has files in it. Created directory. çæ¹ããã¡ã¤ã«ããã£ã¬ã¯ããªã追å ããã¨ããããä¸æ¹ããã£ã¬ã¯ããªããã¡ã¤ã«ãããã¯ã·ã³ããªãã¯ãªã³ã¯ã«å¤æ´ããã¨ãã«ããã¯èµ·ãã¾ãã ä¾ã§ã:: $ bzr init $ bzr mkdir a $ bzr commit -m "BASE" $ bzr branch . ../other $ rmdir a $ touch a $ bzr commit -m "THIS" $ bzr mkdir ../other/a/b $ bzr commit ../other -m "OTHER" $ bzr merge ../other MalformedTransform ------------------- Bazaarã«ä¾å¤ã®MalformedTransformãèµ·åããããã¨å¯è½ã§ã(é常ã«ã¾ãã§ãã)ã ããã¯Bazaarã解決ã§ããªããã¡ã¤ã«ã·ã¹ãã ã®è¡çªã«ééãããã¨ãæå³ãã¾ãã é常ããã¯ãã°ã示ãã¾ããããã«ééãããæãã¦é ããããé¡ããã¾ãã ãã°ãã©ãã«ã¼ã¯ https://launchpad.net/bzr/+bugs ã§ãã ç¾å¨ã®ã¹ãã¬ã¼ã¸ãã©ã¼ããã ============================ :pack-0.92: (ãã¤ãã£ã) (ããã©ã«ã) 0.92ã§æ°ããå°å ¥: dirstate-tagsãã©ã¼ããããªãã¸ããªã¨äºææ§ã®ãããã¼ã¿ãæã¤ããã¯ãã¼ã¹ã®ãã©ã¼ãããã 0.92以åã®bzrãªãã¸ããªã¨ç¸äºéç¨ã§ãã¾ãã0.92以åã®bzrã§ã¯èªãã¾ããã 以åã¯knitpack-experimentalã¨å¼ã°ãã¦ãã¾ããã詳細ãªæ å ±ã«é¢ãã¦ã¯ã http://doc.bazaar-vcs.org/latest/developers/packrepo.html ãåç §ã :1.6: (ãã¤ãã£ã) ã¹ã¿ãã¯ããµãã¼ããããã£ã¬ã¯ããªã«åºã¥ãããã©ã³ãã¨ããã¯ã :1.6.1-rich-root: (ãã¤ãã£ã) ã¹ã¿ãã¯ã¨ãªããrootãã¼ã¿ããµãã¼ããããã©ã³ãã¨ããã¯ãã¼ã¹ã®ãªãã¸ããª(bzr-svnãå¿ è¦) :1.9: (ãã¤ãã£ã) btreeã¤ã³ããã¯ã¹ã使ç¨ãããã©ã³ãã¨ããã¯ãã¼ã¹ã®ãªãã¸ããªã :1.9-rich-root: (ãã¤ãã£ã) btreeã¤ã³ããã¯ã¹ã¨rich rootãã¼ã¿ã使ç¨ãã ãã©ã³ãã¨ããã¯ãã¼ã¹ã®ãªãã¸ããª(bzr-svnã«å¿ è¦)ã ã¹ãã¬ã¼ã¸ãã©ã¼ããã㯠``bzr help formats`` ãåç §ã ç°å¢å¤æ° ======== ================ ================================================================= BZRPATH bzrãã·ã§ã«ãã©ã°ã¤ã³ã³ãã³ããæ¢ããã¹ã BZR_EMAIL ã¦ã¼ã¶ã¼ã®Eã¡ã¼ã«ã¢ãã¬ã¹ãEMAILãä¸æ¸ãããã EMAIL ã¦ã¼ã¶ã¼ã®Eã¡ã¼ã«ã¢ãã¬ã¹ã BZR_EDITOR ã³ãããã¡ãã»ã¼ã¸ã®ç·¨éç¨ã¨ãã£ã¿ãEDITORãä¸æ¸ãããã EDITOR ã³ãããã¡ãã»ã¼ã¸ã®ç·¨éç¨ã¨ãã£ã¿ BZR_PLUGIN_PATH bzrããã©ã°ã¤ã³ãæ¢ããã¹ã BZR_HOME .bazaarã®è¨å®ãã£ã¬ã¯ããªãä¿æãããã£ã¬ã¯ããªãHOMEãä¸æ¸ãããã BZR_HOME (Win32) bazaarè¨å®ãã£ã¬ã¯ããªãä¿æãããã£ã¬ã¯ããªãAPPDATAã¨HOMEãä¸æ¸ãããã BZR_REMOTE_PATH ãªã¢ã¼ã'bzr'ã³ãã³ãã®ãã«ãã¼ã (bzr+ssh:// URLç¨). BZR_SSH SSHã¯ã©ã¤ã¢ã³ã: paramiko (ããã©ã«ã), openssh, ssh, plink. BZR_LOG .bzr.logã®ä½ç½®(ãã®ã³ã°ãåæ¢ããã«ã¯'/dev/null'ã使ã)ã BZR_LOG (Win32) .bzr.logã®ä½ç½®(ãã®ã³ã°ãåæ¢ããã«ã¯'NUL'ã使ã)ã ================ ================================================================= ãã¡ã¤ã« ======== :On Linux: ~/.bazaar/bazaar.conf :On Windows: C:\\Documents and Settings\\username\\Application Data\\bazaar\\2.0\\bazaar.conf ã¦ã¼ã¶ã¼ã®ããã©ã«ãè¨å®ã¯ä¸è¨ã®ã¨ããã§ãã ``[DEFAULT]`` ã»ã¯ã·ã§ã³ãã¹ã¦ã®å ´æã«é©ç¨ãããä¸è¬çãªè¨å®ãå®ç¾©ããããã«ä½¿ç¨ã§ãã¾ãã ``[ALIASES]`` ã»ã¯ã·ã§ã³ã¯å ±éã«ä½¿ç¨ããããªãã·ã§ã³ç¨ã®ã³ãã³ãã¨ã¤ãªã¢ã¹ãä½æããããã«ä½¿ç¨ã§ãã¾ãã å ¸åçãªè¨å®ãã¡ã¤ã«ã¯æ¬¡ã®ã¨ããã§ã:: [DEFAULT] email=John Doe <jdoe@isp.com> [ALIASES] commit = commit --strict log10 = log --short -r -10..-1 ã°ãã¼ãã«ãªãã·ã§ã³ ===================== ãããã®ãªãã·ã§ã³ã¯ä»»æã®ã³ãã³ãã§ä½¿ç¨å¯è½ã§ãã³ãã³ãã®åã§å ¥åãã¾ã(ãã¨ãã°"bzr --profile help")ã --version ãã¼ã¸ã§ã³çªå·ã表示ãããã³ãã³ãã®åã«å ¥åããªããã°ãªããªãã --no-aliases ãã®ã³ãã³ããå®è¡ããéã«ã³ãã³ãã¨ã¤ãªã¢ã¹ãå¦çããªãã --builtin ãã©ã°ã¤ã³ã®ã³ãã³ãã§ã¯ãªããçµã¿è¾¼ã¿ã®ã³ãã³ãã使ç¨ããã ãã®ãªãã·ã§ã³ã¯ä»ã®ãã©ã°ã¤ã³ã®å¹æãæå¶ããªãã --no-plugins ãã©ã°ã¤ã³ãå¦çããªãã --profile ãããã¹ããããããã¡ã¤ã©ã使ç¨ãããããã¡ã¤ã«ã®å®è¡ã --lsprof lsprofãããã¡ã¤ã©ã使ç¨ãããããã¡ã¤ã«ã®å®è¡ã --lsprof-file lsprofãããã¡ã¤ã©ã使ç¨ãããããã¡ã¤ã«ãå®è¡ããçµæãæå®ãã¡ã¤ã«ã«æ¸ãè¾¼ãã ãã¡ã¤ã«åã".txt"ã§çµããå ´å, ããã¹ããã©ã¼ãããã使ç¨ããã¾ãã ãã¡ã¤ã«åã"callgrind.out"ã§å§ã¾ãããããã¯".callgrind"ã§çµããå ´åã KCacheGrindç¨ã«åºåããã©ã¼ããããããã ãããªããã°ãåºåã¯pickleã«ãªãã --coverage æå®ãã£ã¬ã¯ããªã®è¡ã«ãã¬ã¼ã¸ã¬ãã¼ããçæããã ãããã¡ã¤ãªã³ã°ã«é¢ãã詳細ãªæ å ±ã¯doc/developers/profiling.txtãåç §ãã¦ãã ããã ãã©ãã«ã·ã¥ã¼ãã£ã³ã°ã¨éçºãæå©ãããããã®ããããã®ãããã°ãã©ãã°ãå©ç¨å¯è½ã§ãã -Dauth 使ç¨ãããèªè¨¼ã»ã¯ã·ã§ã³ããã¬ã¼ã¹ããã -Derror é常ã®ã¨ã©ã¼ãã³ããªã³ã°ã®ä»£ããã«ã常ã«ã¨ã©ã¼ä¸ã®ãã©ãã¯ããã¯ã表示ããã -Devil å²é«ãªãããã¯ãããã¹ã±ã¼ãªã³ã°ãªãã¬ã¼ã·ã§ã³ãè¡ãã³ã¼ã«ãµã¤ãããã£ããã£ããã -Dfetch ãªãã¸ããªéã®ã³ãã¼ã®å±¥æ´ããã¬ã¼ã¹ããã -Dhashcache ããã·ã¥ã決å®ããããã«ä½æ¥ãã¡ã¤ã«ãèªã¿è¾¼ã¾ãããã³ã«ãã°ãè¨é²ãã -Dhooks ããã¯ã®å®è¡ããã¬ã¼ã¹ããã -Dhpss ã¹ãã¼ããããã³ã«ãªã¯ã¨ã¹ãã¨ã¬ã¹ãã³ã¹ããã¬ã¼ã¹ããã -Dhttp httpæ¥ç¶ããªã¯ã¨ã¹ãã¨ã¬ã¹ãã³ã¹ããã¬ã¼ã¹ããã -Dindex 主è¦ãªindexãªãã¬ã¼ã·ã§ã³ããã¬ã¼ã¹ããã -Dknit knitãªãã¬ã¼ã·ã§ã³ããã¬ã¼ã¹ããã -Dlock lockdirããã¯ãã¨ããããããã¯ãªãªã¼ã¹ãããã¨ãããã¬ã¼ã¹ããã -Dmerge ãã¼ã¸ã®ãããã°ç¨ã®æ å ±ã表示ããã -Dpack packãªãã¬ã¼ã·ã§ã³ç¨ã®æ å ±ã表示ããã ãã㯠======= ç´¹ä» ----- *yyy* ã¯ã©ã¹ã® *xxx* ã¿ã¤ãã®ããã¯ã使ç¨ããã«ã¯ç»é²ããå¿ è¦ãããã¾ã:: yyy.hooks.install_named_hook("xxx", ...) ä¾ã«é¢ãã¦ã¯ã¦ã¼ã¶ã¼ã¬ã¤ãã® `ããã¯ãå©ç¨ãã`_ ãåç §ãã¦ãã ããã .. _ããã¯ãå©ç¨ãã: ../user-guide/index.html#id186 ããããã®ããã¯ãå«ãã¯ã©ã¹ã¯ä¸è¨ã®ããããã®ããã¯ã¿ã¤ãã®å¾ã§ä¸¸ãã£ãã®ä¸ã§ç¤ºããã¾ãã ããããã®èª¬æã§ã¯ã¯ã©ã¤ã¢ã³ã(bzrãå®è¡ããããã·ã³)ãããã¯ãµã¼ãã¼ (ãã©ã³ãURLã§ç¤ºããããã·ã³)ã§å®è¡ãããã示ãã¾ãã ãããã¯å¿ ãããåããã·ã³ã§ã¯ããã¾ããã 以ä¸ã®1ã¤ãtrueã®å ´å(ããã¯ãå«ã)ãã©ã°ã¤ã³ã¯ãµã¼ãã¼ä¸ã§å®è¡ããã¾ã: * ãªã¢ã¼ããã©ã³ããã¯ã©ã¤ã¢ã³ãã¨åããã·ã³ä¸ã«ãããã¯ã©ã¤ã¢ã³ãã¯ãã©ã°ã¤ã³ãæå¹ã«ãã¦ããã * æ¥ç¶ã¯ã¹ãã¼ããµã¼ãã¼çµç±ã§è¡ãã("bzr://"ã"bzr+ssh://"ãããã¯"bzr+http://"㧠å§ã¾ãURLã§ã¢ã¯ã»ã¹ãããããã¯ã¹ãã¼ããµã¼ãã¼ãHTTPçµç±ã§å©ç¨å¯è½ãªã¨ãã« "http://"ã§ã¢ã¯ã»ã¹ãã)ããµã¼ãã¼ããã©ã°ã¤ã³ãæå¹ã«ãã¦ããã open (Branch) ------------- Branchãªãã¸ã§ã¯ããéããå¾ã§ãBranchãªãã¸ã§ã¯ãã«ãã£ã¦å¼ã³åºããã¾ãã ã¯ã©ã¤ã¢ã³ãã¨ãµã¼ãã¼ã§å®è¡ãã¾ãã post_push (Branch) ------------------ ``push`` ãå®äºããå¾ã§å®è¡ããã¾ãã ã¯ã©ã¤ã¢ã³ãã§å®è¡ãã¾ãã ããã¯ã®ã·ã°ããã£ã¯ (push_result) ã§ã¡ã³ãã¼ãå«ã¿ã¾ãã source_branch ãã¼ã¿ãpushãããå ´æ(èªã¿è¾¼ã¿ã¯ããã¯ããã)ã ããã¯æãä½ãã¬ã¤ãã³ã·ãã©ã³ãã«ãªãã¾ãã target_branch ãã¼ã¿ãéä¿¡ãããç´æ¥ã®å ´æ(æ¸ãè¾¼ã¿ãããã¯ããã)ã master_branch target_branchããããã¯ã¿ã¼ã²ããããã¤ã³ãããããã©ã³ãã®å ´åã ããã¯ãã¹ã¿ã¼ãã±ã¼ã·ã§ã³ã«ãªãã¾ã(æ¸ãè¾¼ã¿ã¯ããã¯ããã)ã local_branch ã¿ã¼ã²ããããã¤ã³ãããããã©ã³ãã®å ´åããããã¿ã¼ã²ãããã©ã³ãã«ãªãã ããã§ãªããã°ãNoneã«ãªãã¾ãã old_revno push以åã®ãã©ã³ãã®ãªãã¸ã§ã³çªå·(ãã¨ãã°10)ã old_revid push以åã®ãªãã¸ã§ã³id (ãã¨ãã° joe@foo.com-1234234-aoeua34)ã new_revno pushå¾ã®ãã©ã³ãã®ãªãã¸ã§ã³çªå·(ãã¨ãã°12)ã new_revid pushå¾ã®ãªãã¸ã§ã³id (ãã¨ãã° joe@foo.com-5676566-boa234a) post_pull (Branch) ------------------ ``pull`` ãå®äºãå¾ã§å®è¡ããã¾ãã ããã¯ã®ã·ã°ããã£ã¯ (push_result) ã§æ¬¡ã®ã¡ã³ãã¼ãå«ã¿ã¾ã: (source, local, master, old_revno, old_revid, new_revno, new_revid)ã localã¯ãã¼ã«ã«ã®ã¿ã¼ã²ãããã©ã³ããããã¯Noneã§ã masterã¯ã¿ã¼ã²ããã®ãã¹ã¿ã¼ãã©ã³ãã§ãæ®ãã¯è¦ãã¨ããã§ãã sourceã§ã¯èªã¿è¾¼ã¿ãããã¯ããã¿ã¼ã²ãããã©ã³ãã§ã¯æ¸ãè¾¼ã¿ãããã¯ããã¾ãã sourceã¯ãã¼ã«ã«ã®ä½ã¬ã¤ãã³ã·ãã©ã³ãã«ãªãã¾ãã start_commit (MutableTree) -------------------------- ``commit`` ãä½æ¥ããªã¼ã®å¦çãå§ããåã«ä½æ¥ããªã¼ä¸ã§å®è¡ããã¾ãã ã¯ã©ã¤ã¢ã³ãã§å®è¡ãã¾ãã ``pre_commit`` ããã¯(ä¸è¨ãåç §)ã¨ã¯ç°ãªãã ``start_commit`` ããã¯ã¯ä½æ¥ããªã¼ãå®å ¨ã«å¤æ´ã§ãã¾ãã ããã¯ã®ã·ã°ããã£ã¯ããªã¼ãMutableTreeãªãã¸ã§ã¯ãã§ããå ´æ(ããªã¼)ã§ã pre_commit (Branch) ------------------- ``commit`` ãå®äºããåã«å®è¡ããã¾ãã ã¯ã©ã¤ã¢ã³ãã§å®è¡ãã¾ãã ããã¯ã®ã·ã°ããã£ã¯ (local, master, old_revno, old_revid, future_revno, future_revid, tree_delta, future_tree)ã§ãã old_revnoã¯ãã©ã³ãã«æåã«ã³ãããããããã®NULL_REVISIONã§ã tree_deltaã¯åºåºãªãã¸ã§ã³ããã®å¤æ´ãè¨è¿°ããTreeDeltaãªãã¸ã§ã¯ãã§ã future_treeã¯ã¤ã³ã¡ã¢ãªããªã¼ã§CommitBuilder.revision_tree()ããå¾ããã¾ãã ããã¯ã¯tree_deltaã¨future_treeãä¿®æ£ãã *å¿ è¦ã¯ããã¾ãã* ã post_commit (Branch) -------------------- ``commit`` ãå®äºããå¾ã§å®è¡ããã¾ãã ã¯ã©ã¤ã¢ã³ãã§å®è¡ãã¾ãã ããã¯ã®ã·ã°ããã£ã¯ (local, master, old_revno, old_revid, new_revno, new_revid)ã§ãã old_revidã¯ãã©ã³ãã¸ã®æåã®ã³ãããã®ããã®NULL_REVISIONã§ãã post_uncommit (Branch) ---------------------- ``uncommit`` ãå®äºããå¾ã§å®è¡ããã¾ãã apiã®ã·ã°ããã£ã¯ (local, master, old_revno, old_revid, new_revno, new_revid)ã§ãã localã¯ãã¼ã«ã«ãã©ã³ããããã¯Noneã§ãmasterã¯ã¿ã¼ã²ãããã©ã³ãã§ã 空ã®ãã©ã³ãã¯0ã®new_revnoãNoneã®new_revidãåãåãã¾ãã pre_change_branch_tip (Branch) ------------------------------- ãã©ã³ãã®æ¸ãè¾¼ã¿ãããã¯ããã¦ããéã«ããã©ã³ãããããå¤æ´ãããåã«å®è¡ããã¾ãã ã¯ã©ã¤ã¢ã³ãã¨ãµã¼ãã¼ã§å®è¡ãã¾ãã pushãpullãcommitã¨uncommitã®ãã¹ã¦ã¯ãã®ããã¯ãèµ·åããããã¨ã«æ³¨æãã¦ãã ããã ããã¯ã®ã·ã°ããã£ã¯ (params) ã§ãparamsã¯ã¡ã³ãã¼ãå«ããªãã¸ã§ã¯ãã§ãã branch ããããå¤æ´ããããã©ã³ãã old_revno å¤æ´åã®ãã©ã³ãã®ãªãã¸ã§ã³çªå·(ãã¨ãã°10)ã old_revid å¤æ´åã®ãªãã¸ã§ã³id (ãã¨ãã° joe@foo.com-1234234-aoeua34)ã new_revno å¤æ´å¾ã®ãã©ã³ãã®ãªãã¸ã§ã³çªå·(ãã¨ãã°12)ã new_revid å¤æ´å¾ã®ãªãã¸ã§ã³id (ãã¨ãã° joe@foo.com-5676566-boa234a)ã ããããªãã¸ã§ã³ã¯ãããã¤ãã®ãªãã¸ã§ã³çªå·ããã£ãã¦æããªãã®ã§ãold_revnoã¨new_revnoã¡ã³ãã¼ã¯æ´æ°ã§ãã post_change_branch_tip (Branch) ------------------------------- ãã©ã³ãã®æ¸ãè¾¼ã¿ãã¾ã ããã¯ããã¦ããéã«ãã©ã³ãã®ããããå¤æ´ãããå¾ã«å®è¡ããã¾ãã ã¯ã©ã¤ã¢ã³ãã¨ãµã¼ãã¼ã§å®è¡ãã¾ãã pushãpullãcommitã¨uncommitãã¹ã¦ããã®ããã¯ãèµ·åããããã¨ã«æ³¨æãã¦ãã ããã ããã¯ã·ã°ããã£ã¯(params)ã§ãparamsã¯æ¬¡ã®ã¡ã³ãã¼ãå«ããªãã¸ã§ã¯ãã§ãã branch ããããå¤æ´ããããã©ã³ãã old_revno å¤æ´åã®ãã©ã³ãã®ãªãã¸ã§ã³çªå· (ãã¨ãã°10)ã old_revid å¤æ´åã®ãªãã¸ã§ã³id(ãã¨ãã° joe@foo.com-1234234-aoeua34)ã new_revno å¤æ´å¾ã®ãã©ã³ãã®ãªãã¸ã§ã³çªå·(ãã¨ãã°12)ã new_revid å¤æ´å¾ã®ãªãã¸ã§ã³id(ãã¨ãã° joe@foo.com-5676566-boa234a)ã ããããªãã¸ã§ã³ã¯ãããã¤ãã®ãªãã¸ã§ã³çªå·ããã£ãã¦æããªãã®ã§old_revnoã¨new_revnoã¡ã³ãã¼ã¯æ´æ°ã§ãã set_rh (Branch) --------------- 注æ: ãã®ããã¯ã¯å»æ¢ããè¿ãå°æ¥ã®å ã«åé¤ããã¾ãã 代ããã« ``post_change_branch_tip`` ããã¯ã使ç¨ãã¦ãã ãããããé¡ããã¾ãã transform_fallback_location (Branch) ------------------------------------ ã¹ã¿ãã¯ããã©ã³ãã¨ãã¦èµ·åããããã©ã¼ã«ããã¯ãã±ã¼ã·ã§ã³ãã¢ã¯ãã£ãã¤ããã¾ãã ããã¯ã®ã·ã°ããã£ã¯(branch, url)ã§ã: branch éãããã©ã³ããã¾ã ãã©ã¼ã«ããã¯ãã±ã¼ã·ã§ã³ãã¢ã¯ãã£ãã¤ããããªããã°ã ãã©ã³ãã¯ååãã«ãããããã®ã¨ãã¦æ±ããããã¨ã«æ³¨æãã¦ãã ããã url ãã©ã¼ã«ããã¯ãã±ã¼ã·ã§ã³ç¨ã«ãã©ã³ããæå®ãããURLã ããã¯ã¯ãã©ã¼ã«ããã¯ãã±ã¼ã·ã§ã³ãå«ããã©ã³ãã®ããã«URLãè¿ããªããã°ãªãã¾ããã è¤æ°ã®ããã¯ãç»é²ããã¦ããã¨ãå¼ã³åºãããé çªã¯æªå®ç¾©ã§å¤æ´ã®å½±é¿ãåãã¾ãã (1.9ã®æ°ããæ©è½) server_started (SmartTCPServer) ------------------------------- ãµã¼ãã¼ããã£ã¬ã¯ããªã®ãµã¼ãã¹ãæä¾å§ãããã³ã«èµ·åãã¾ãã ãµã¼ãã¼ã§å®è¡ããã¾ãã ããã¯ã®ã·ã°ããã£ã¯ (backing urls, public url)ã§ãã backing_url ãµã¼ãã¼åºæã®ãã£ã¬ã¯ããªã®ä½ç½®ã渡ã(string) URLã®ãªã¹ãã public_url ãã£ã¬ã¯ããªç¨ã®å ¬éURLã server_stopped (SmartTCPServer) ------------------------------- ãµã¼ãã¼ããã£ã¬ã¯ããªã®æä¾ãåæ¢ããã¨ãã«å¸¸ã«èµ·åãã¾ãã ãµã¼ãã¼ã§å®è¡ãã¾ãã ããã¯ã®ã·ã°ããã£ã¯ ``server_started`` ã¨åãã§ãã lock_acquired (LockDir) ---------------------------- ããã¯ã®åå¾ãæåããã¨ãã«LockResultãªãã¸ã§ã¯ãã§å¼ã³åºããã¾ã(1.8ã§å°å ¥)ã lock_released (LockDir) ---------------------------- ããã¯ã®ãªãªã¼ã¹ãæåããã¨ãã«LockResultãªãã¸ã§ã¯ãã§å¼ã³åºããã¾ã(1.8ã§å°å ¥)ã ã¯ã©ã¤ã¢ã³ãã§å®è¡ãã¾ãã commit_message_template (msgeditor) ----------------------------------- ã³ãããã¡ãã»ã¼ã¸ãã³ãã¬ã¼ããçæããããã«ã³ãããã«ãã£ã¦èµ·åããã ããããã®ããã¯ã¯ã³ãããã¡ãã»ã¼ã¸ãã³ãã¬ã¼ããä¿®æ£ã§ãã¾ãã ããã¯ã®ã·ã°ããã£ã¯ (commit, start_message)ã§ã: commit é²è¡ä¸ã®ã³ãããã®ããã®ãã³ããããªãã¸ã§ã¯ã start_message ãªãªã¸ãã«ã®ã³ãããã¡ãã»ã¼ã¸ã§ãåæã¯Noneã ããã¯ã¯æ°ããã³ãããã¡ãã»ã¼ã¸ãã³ãã¬ã¼ããè¿ãã¾ãã (1.10ã®æ°ããæ©è½) ãã®ä»ã®ã¹ãã¬ã¼ã¸ãã©ã¼ããã ============================== å®é¨çãªãã©ã¼ãããã¯æ¬¡ã®ã¨ããã§ãã :1.12-preview: (ãã¤ãã£ã) ãã¥ã¼ã¨ã³ã³ãã³ãã®ãã£ã«ã¿ãªã³ã°ããµãã¼ãããä½æ¥ããªã¼ãã©ã¼ãããã :1.12-preview-rich-root: (ãã¤ãã£ã) rich-rootãã¼ã¿ããµãã¼ããã1.12-previewã®ããªã¢ã³ã(bzr-svnã«å¿ è¦)ã :development: (ãã¤ãã£ã) ç¾å¨ã®éçºãã©ã¼ãããã pack-0.92 (ã¨pack-0.92ã¨äºææ§ã®ãã)ãã©ã¼ããããªãã¸ããªã«ãã¼ã¿ãå¤æã§ãã¾ãã ãã®ãã©ã¼ãããã®ãªãã¸ããªã¨ãã©ã³ãã¯bzr.devã«ãã£ã¦ã®ã¿èªã¿è¾¼ã¿ã§ãã¾ãã 使ç¨ããåã« http://doc.bazaar-vcs.org/latest/developers/development-repo.html ãã覧ä¸ãããããé¡ããã¾ãã :development-subtree: (ãã¤ãã£ã) ç¾å¨ã®éçºãã©ã¼ãããããµãããªã¼ã®ããªã¢ã³ãã pack-0.92-subtree (pack-0.92-subtreeã¨äºææ§ã®ãããã®ãªãä½ã§ã)ãã©ã¼ããããªãã¸ã㪠ãã/ã¸ã®ãã¼ã¿ã®å¤æãã§ããããã®ãã©ã¼ãããã®ãªãã¸ããªã¨ãã©ã³ã㯠bzr.devã«ãã£ã¦ã®ã¿èªã¿è¾¼ã¿ã§ãã¾ãã 使ç¨ããåã« http://doc.bazaar-vcs.org/latest/developers/development-repo.html ãã覧ä¸ãããããé¡ããã¾ãã å»æ¢ããããã©ã¼ãããã¯ä¸è¨ã®ã¨ããã§ãã :metaweave: (ãã¤ãã£ã) 0.8ã®æ«å®çãªãã©ã¼ããããknitãããé ã :weave: (ãã¤ãã£ã) 0.8以åã®ãã©ã¼ããããknitãããé ããã§ãã¯ã¢ã¦ãã¨å ±ç¨ãªãã¸ããªããµãã¼ãããªãã :knit: (ãã¤ãã£ã) knitã使ç¨ãããã©ã¼ãããã0.14ã¨ãã以åã®bzrã¨ã®ç¸äºéç¨ã«æ¨å¥¨ãããã :dirstate: (ãã¤ãã£ã) 0.15ã§ã®æ°ãããã©ã¼ããã: ãã¼ã«ã«ãªãã¬ã¼ã·ã§ã³ãéãã ãããã¯ã¼ã¯ãéãã¦ã¢ã¯ã»ã¹ããã¨ãã¯0.8ã¨ãã以éã®bzrã¨äºææ§ãããã :dirstate-tags: (ãã¤ãã£ã) 0.15ã§ã®æ°ãããã©ã¼ããã: éããã¼ã«ã«ãªãã¬ã¼ã·ã§ã³ã¨ãããã¯ã¼ã¯ãªãã¬ã¼ã·ã§ã³ã«é¢ããæ¹åãããã¹ã±ã¼ãªã³ã°ã ã¿ã°ç¨ã®ãµãã¼ãã追å ã0.15以åã®bzrã¨ã¯äºææ§ããªã :rich-root: (ãã¤ãã£ã) 1.0ã§ã®æ°ãããã©ã¼ããããããªã¼rootã®æ±ããæ¹åã1.0以åã®bzrã¨äºææ§ããªãã 詳細ãªã¹ãã¬ã¼ã¸ãã©ã¼ããã㯠``bzr help formats`` ãåç §ãã¦ãã ããã ãªãã¸ã§ã³ã®èå¥å ==================== ãªãã¸ã§ã³ã®èå¥åã¯ãã©ã³ãã®å±¥æ´ã®ç¹å®ã®ç¶æ ãåç §ãã¾ãã ããã¯ãªãã¸ã§ã³çªå·ãããã㯠':' ãå¾ã«ç¶ããã¼ã¯ã¼ããã¨ä»ã®ãã©ã¡ã¼ã¿ã«ãªãã¾ãã èå¥åã®ä¾ã¨ã㦠'3' ã 'last:1' ã 'before:yesterday' 㨠'submit:' ãªã©ãããã¾ãã 'REV1' 㨠'REV2' ããªãã¸ã§ã³ã®èå¥åã§ããå ´åã 'REV1..REV2' ã¯ãªãã¸ã§ã³ã®ç¯å²ã表示ãã¾ãã ä¾: '3647..3649' ã 'date:yesterday..-1' 㨠'branch:/path/to/branch1/..branch:/branch2' ('..'å¨è¾ºã«ã¯ã¯ã©ã¼ããããã¯ã¹ãã¼ã¹ãåå¨ãã¾ãã)ã ç¯å²ã¯ç°ãªãã³ãã³ãã«ãã£ã¦ç°ãªã解éããªããã¾ãã "log" ã³ãã³ãã«å¯¾ãã¦ãç¯å²ã¯ãã°ã¡ãã»ã¼ã¸ã®ã·ã¼ã±ã³ã¹ã§ã "diff" ã³ãã³ãã«å¯¾ãã¦ã¯ãç¯å²ã¯(å¤æ´ã®ã·ã¼ã±ã³ã¹ã§ã¯ãªã)ãªãã¸ã§ã³éã®å¤æ´ã表示ãã¾ãã å ãã¦ã "log" ã¯closed rangeãèæ ®ããã®ã«å¯¾ãã¦"diff"ã¨"merge"ã¯open-endedã¨ã¿ãªãã ããªãã¡ããããã¯1ã¤ã®endãå«ã¿ã¾ããä»æ¹ã¯å«ã¿ã¾ããã ä¾ã§ã: "bzr log -r 3647..3649"ã¯ãªãã¸ã§ã³3647ã3648ã¨3649ã®ã¡ãã»ã¼ã¸ã表示ããã®ã«å¯¾ãã¦ã "bzr diff -r 3647..3649"ã¯3647ã¨3648ã®éã«è¡ãããå¤æ´ãå«ã¿ã3649ã®å¤æ´ã¯å«ã¿ã¾ããã ãªãã¸ã§ã³é¸ææ¹æ³ã¨ãã¦ä½¿ç¨ããããã¼ã¯ã¼ãã¯æ¬¡ã®ã¨ããã§ã: :revno: çªå·ã使ç¨ãããªãã¸ã§ã³ãé¸æããã :revid: ãªãã¸ã§ã³idã使ç¨ãããªãã¸ã§ã³ãé¸æããã :last: æå¾ããnçªç®ã®ãªãã¸ã§ã³ãé¸æããã :before: æå®ããããªãã¸ã§ã³ã®è¦ªãé¸æããã :tag: ã¿ã°åã«ãã£ã¦èå¥ããããªãã¸ã§ã³ãé¸æããã :date: æ¥ä»ã¹ã¿ã³ããåºæ¬ã¨ãããªãã¸ã§ã³ãé¸æããã :ancestor: 2çªç®ã®ãã©ã³ãã§å ±éã®ç¥å ãé¸æããã :branch: æå®ãã©ã³ãã®æçµãªãã¸ã§ã³ãé¸æããã :submit: æ稿ãã©ã³ãã§å ±éã®ç¥å ãé¸æããã å ãã¦ããã©ã°ã¤ã³ã¯ä»ã®ãã¼ã¯ã¼ããæä¾ã§ãã¾ãã ããããã®ãã¼ã¯ã¼ãã®è©³ç´°ãªèª¬æã¯ä¸è¨ã®ã¨ããã§ãã :revno: ãã©ã³ãã®å±¥æ´å ã®ãªãã¸ã§ã³ãæå®ããããã«æ´æ°ã使ç¨ããã ãªãã·ã§ã³ã¨ãã¦ãã©ã³ããæå®ã§ãã¾ããæ¥é è¾ã® 'revno:' ã¯ãªãã·ã§ã³ã§ãã è² ã®æ°ã¯ãã©ã³ãã®æå¾ããæ°ãã¾ã(-1ã¯æå¾ã®ãªãã¸ã§ã³ã-2ã¯ãã®åã®ãªãã¸ã§ã³)ã è² ã®æ°ããã©ã³ãã®å±¥æ´ããã大ããå ´åãæåã®ãªãã¸ã§ã³ãè¿ããã¾ãã ä¾:: revno:1 -> ãã®ãã©ã³ãã®æåã®ãªãã¸ã§ã³ãè¿ã revno:3:/path/to/branch -> '/path/to/branch' ãã©ã³ãã®3çªç®ã®ãªãã¸ã§ã³ãè¿ã revno:-1 -> ãã©ã³ãã®æå¾ã®ãªãã¸ã§ã³ã -2:http://other/branch -> ãªã¢ã¼ããã©ã³ãã®æå¾ãã2çªç®ã®ãªãã¸ã§ã³ã -1000000 -> å±¥æ´ãã¨ã¦ãé·ããªããã°ãããããã¯æåã®ãªãã¸ã§ã³ã :revid: ç¹å®ã®ãªãã¸ã§ã³idãæä¾ãã¾ãã ãã©ã³ãã®ç¥å ã®ãªãã¸ã§ã³idãæå®ããããã«ä½¿ç¨ã§ãã¾ãã ãã¼ã¸ã¨ããã¼ã¸ã®è¿½å ãå«ãã ä¾:: revid:aaaa@bbbb-123456789 -> ãªãã¸ã§ã³ 'aaaa@bbbb-123456789' ãé¸æãã :last: æå¾ããnçªç®ã®ãªãã¸ã§ã³ãåå¾ããã«ã¯æ£ã®æ°ãæä¾ããã è² ã®æ°ã®æä¾ã«é¢ãã¦ã¯ 'revno:' ã®ä»æ§ã¨åãã§ãã ä¾:: last:1 -> æå¾ã®ãã¼ã¸ã§ã³ãè¿ãã last:3 -> æå¾ã®2ã¤åã®ãªãã¸ã§ã³ãè¿ãã :before: ãã®ãªãã¸ã§ã³ã®è¦ªãè¿ããªãã¸ã§ã³ã¹ããã¯ãæä¾ããã 主ã«ãã©ã³ãã®ãªãã¸ã§ã³ã®å±¥æ´ã®ä¸ã«åå¨ããªããªãã¸ã§ã³ãæ¤æ»ããéã«ä¾¿å©ã§ãã nullãªãã¸ã§ã³(before:0)ã®è¦ªããªã¯ã¨ã¹ãããã®ã¯ééãã§ãã ä¾:: before:1913 -> revno 1913ã®è¦ªãè¿ã (revno 1912) before:revid:aaaa@bbbb-1234567890 -> ãªãã¸ã§ã³aaaa@bbbb-1234567890ã®è¦ªãè¿ã bzr diff -r before:1913..1913 -> ãªãã¸ã§ã³1913ã¨ãã®è¦ª(1912)ã®éã®å¤æ´ãè¦ã¤ãã (ãªãã¸ã§ã³1913ãå°å ¥ããå¤æ´ãè¡ããã¨)ã ãã㯠bzr diff -c 1913ã¨åçã§ã :tag: ã¿ã°ã¯ãã©ã³ãã«ä¿åããã'tag'ã³ãã³ãã«ãã£ã¦ä½æãããã :date: æ¥ä»ã«ãããããæåã®ãªãã¸ã§ã³ãé¸æããããã®ãã¼ã¿ã¹ã¿ã³ããæä¾ããã æ¥ä»ã¯ 'yesterday'ã'today'ã'tomorrow' ãããã¯YYYY-MM-DDã®æååã§ãã ä¸ããããæ¥ä»(æ·±å¤ãããã¯æå®ãããæéã®ã©ã¡ãã)ã®å¾ã®æåã®ã¨ã³ããªã«ãããããã æ¨æ¥ä»¥éã®ãã¹ã¦ã®å¤æ´ã表示ããæ¹æ³ã®1ã¤ã¯æ¬¡ã®ã¨ããã§ã:: bzr log -r date:yesterday.. ä¾:: date:yesterday -> æ¨æ¥ä»¥éã®æåã®ãªãã¸ã§ã³ãé¸æãã date:2006-08-14,17:10:14 -> August 14th, 2006 at 5:10pmã®å¾ã®æåã®ãªãã¸ã§ã³ãé¸æããã :ancestor: å ±éã®ç¥å ãé¸æããããã«ãã©ã³ãã¸ã®ãã¹ãæä¾ããã å ±éã®ç¥å ã¯ä¸¡æ¹ã®ãã©ã³ãã®ä¸ã«åå¨ããæå¾ã®ãªãã¸ã§ã³ã§ãã é常ããã¯ãã©ã³ããã¤ã³ãã§ããããã¼ã¸ããããªãã¸ã§ã³ã«ããªãå¾ã¾ãã ãªã¢ã¼ããã©ã³ããããã¼ã¸ããªãã£ãå¤æ´ãé¤å¤ããä¸æ¹ã§ã ããã¯ãã©ã³ããå°å ¥ãããã¹ã¦ã®å¤æ´ãè¿ãããã« 'diff' ã§ãã使ç¨ããã¾ãã ä¾:: ancestor:/path/to/branch $ bzr diff -r ancestor:../../mainline/branch :branch: æå¾ã®ãªãã¸ã§ã³ãé¸æããããã«ãã©ã³ãã¸ã®ãã¹ãæä¾ããã ä¾:: branch:/path/to/branch :submit: ããã«å¯¾ããå·®åã¯ããã®ãã©ã³ãã§è¡ããããã¹ã¦ã®å¤æ´ã表示ãã ãã¼ã¸ãããäºå®ã®ãã®ã®ããäºæ¸¬åã§ãã æ稿ãã©ã³ãã¯bundleã¨mergeã³ãã³ãã«ãã£ã¦ä½¿ç¨ããã¾ãã æ稿ãã©ã³ããæå®ãããªããã°ã親ãã©ã³ãã代ããã«ä½¿ç¨ããã¾ãã å ±éã®ç¥å ã¯ä¸¡æ¹ã®ãã©ã³ãå ã«åå¨ããæçµãªãã¸ã§ã³ã§ãã é常ããã¯ãã©ã³ããã¤ã³ãã§ããããã¼ã¸ããããªãã¸ã§ã³ã«ããªãå¾ã¾ãã ä¾:: $ bzr diff -r submit: æ¨æºãªãã·ã§ã³ =============== æ¨æºãªãã·ã§ã³ã¯ãã¹ã¦ã®ã³ãã³ãã§æå¹ã§ãã --help, -h ãã«ãã¡ãã»ã¼ã¸ã表示ããã --verbose, -v 詳細ãªæ å ±ã表示ããã --quiet, -q ã¨ã©ã¼ã¨è¦åã®ã¿è¡¨ç¤ºããã ã°ãã¼ãã«ãªãã·ã§ã³ã¨ã¯ç°ãªããæ¨æºãªãã·ã§ã³ã¯ã¨ã¤ãªã¢ã¹ã§å©ç¨å¯è½ã§ãã ã¹ãã¼ã¿ã¹ãã©ã° ================== ç°¡æ½ãªæ¹æ³ã§ä½æ¥ããªã¼ã¸ã®å¤æ´ãè¦ç´ããããã«ã¹ãã¼ã¿ã¹ãã©ã°ã使ç¨ããã¾ãããããã¯æ¬¡ã®å½¢å¼ãã¨ãã¾ã:: xxx <filename> ã«ã©ã ã®æå³ã¯æ¬¡ã®ã¨ããã§ãã ã«ã©ã 1 - ãã¼ã¸ã§ã³ç®¡ç/ãªãã¼ã :: + ãã¼ã¸ã§ã³ç®¡çããã¦ãããã¡ã¤ã« - ãã¼ã¸ã§ã³ç®¡çããã¦ããªããã¡ã¤ã« R ãªãã¼ã ããããã¡ã¤ã« ? æªç¥ã®ãã¡ã¤ã« C è¡çªããå 容ãæã¤ãã¡ã¤ã« P ãã¼ã¸ã追å ããããã®ã¨ã³ããª(ãã¡ã¤ã«ã§ã¯ãªã) ã«ã©ã 2 - ã³ã³ãã³ã:: N ä½æããããã¡ã¤ã« D åé¤ããããã¡ã¤ã« K å¤æ´ããããã¡ã¤ã«ã®ç¨®é¡ M ä¿®æ£ããããã¡ã¤ã« ã«ã©ã 3 - å®è¡:: * å®è¡ãå°ãå¤æ´ããã URLã®èå¥å ============ ãµãã¼ããããURLã®æ¥é è¾:: aftp:// ã¢ã¯ãã£ãFTPãå©ç¨ããã¢ã¯ã»ã¹ bzr:// Bazaarã¹ãã¼ããµã¼ãã¼ãå©ç¨ãããã¡ã¼ã¹ãã¢ã¯ã»ã¹ bzr+ssh:// SSHãéããBazaarã¹ãã¼ããµã¼ãã¼ãå©ç¨ãããã¡ã¼ã¹ãã¢ã¯ã»ã¹ file:// æ¨æºãã¡ã¤ã«ã·ã¹ãã ãå©ç¨ããã¢ã¯ã»ã¹(ããã©ã«ã) ftp:// ããã·ãFTPãå©ç¨ããã¢ã¯ã»ã¹ http:// ã¦ã§ãã«ã¨ã¯ã¹ãã¼ãããããã©ã³ãã¸ã®ãªã¼ããªã³ãªã¼ã®ã¢ã¯ã»ã¹ã https:// SSLãå©ç¨ããã¦ã§ãã«ã¨ã¯ã¹ãã¼ãããããã©ã³ãã¸ã®ãªã¼ããªã³ãªã¼ã®ã¢ã¯ã»ã¹ã sftp:// SFTPãå©ç¨ããã¢ã¯ã»ã¹(大æµã®SSHãµã¼ãã¼ã¯SFTPãæä¾ãã)ã .. _authentication: `èªè¨¼ã®è¨å®`_ .. _bugs: `ãã°ãã©ãã«ã¼ã®è¨å®`_ .. _configuration: `æ§æè¨å®`_ .. _conflicts: `è¡çªã®ã¿ã¤ã`_ .. _current-formats: `ç¾å¨ã®ã¹ãã¬ã¼ã¸ãã©ã¼ããã`_ .. _env-variables: `ç°å¢å¤æ°`_ .. _global-options: `ã°ãã¼ãã«ãªãã·ã§ã³`_ .. _other-formats: `ãã®ä»ã®ã¹ãã¬ã¼ã¸ãã©ã¼ããã`_ .. _revisionspec: `ãªãã¸ã§ã³ã®èå¥å`_ .. _standard-options: `æ¨æºãªãã·ã§ã³`_ .. _status-flags: `ã¹ãã¼ã¿ã¹ãã©ã°`_ .. _urlspec: `URLã®èå¥å`_ ã³ãã³ã ######### add === :ç®ç: æå®ãããã¡ã¤ã«ãããã¯ãã£ã¬ã¯ããªã追å ããã :使ãæ¹: bzr add [FILE...] :ãªãã·ã§ã³: --dry-run ä½ãè¡ãããã表示ããããå®éã«ã¯è¡ããªãã -v, --verbose 詳細ãªæ å ±ã表示ããã --no-recurse ãã£ã¬ã¯ããªã®å 容ãå帰çã«è¿½å ããªãã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã --file-ids-from=ARG ãã®ããªã¼ãããã¡ã¤ã«ã®idãæ¢ç´¢ããã :説æ: non-recursiveã¢ã¼ãã§ã¯ã以åç¡è¦ããããã¡ã¤ã«ã§ãã£ã¦ãã ååã¤ãã®ãã¹ã¦ã®ã¢ã¤ãã ã追å ããã¾ãã ååã¤ããã¡ã¤ã«ããã§ã«ãã¼ã¸ã§ã³ç®¡çããã¦ããå ´åã¯è¦åã表示ããã¾ãã recursiveã¢ã¼ã(ããã©ã«ã)ã§ã¯ããã¡ã¤ã«ã¯åãæ¹æ³ã§æ±ããã¾ããã ãã£ã¬ã¯ããªã«å¯¾ãããµãã¾ãã¯ç°ãªãã¾ãã ãã§ã«ãã¼ã¸ã§ã³ç®¡çããã¦ãããã£ã¬ã¯ããªã§ããã°è¦åã¯è¡¨ç¤ºããã¾ããã ãã¹ã¦ã®ãã£ã¬ã¯ããªã¯ããã¼ã¸ã§ã³ç®¡çããã¦ãããããªããã«é¢ãããã ãã¡ã¤ã«ãããã¯ãã¼ã¸ã§ã³ç®¡çãç¡è¦ãããã¦ãããµããã£ã¬ã¯ããªã®ããã®æ¤ç´¢å¯¾è±¡ã«ãªãã ãããã¯è¿½å ããã¾ãã ãã®æ¤ç´¢ã¯ãã¼ã¸ã§ã³ç®¡çããããã£ã¬ã¯ããªã«ãå帰çã«é²ãããã¾ãã ååã渡ãããªããã°ã'.'ãæ³å®ããã¾ãã ããããåã« 'bzr add' ãå®è¡ããã¨ç¾å¨æªç¥ã§ãããã¡ã¤ã«ã®ãã¹ã¦ããã¼ã¸ã§ã³ç®¡çããã¾ãã 親ãã£ã¬ã¯ããªããã¼ã¸ã§ã³ç®¡çããã¦ããªããã¡ã¤ã«ã追å ãã㨠親ããã³ãã®rootã¾ã§ãæé»ã®å ã«è¿½å ããã¾ãã ãã®ãã¨ãæå³ããã®ã¯ãã£ã¬ã¯ããªãæ示çã«è¿½å ããå¿ è¦ã¯ãªãã ãã£ã¬ã¯ããªã®ä¸ã®ãã¡ã¤ã«ã1ã¤è¿½å ããã¨ãã«ãããã®ãã£ã¬ã¯ããªã追å ããã¾ãã --dry-runã¯è¿½å ããããã¡ã¤ã«ã表示ãã¾ãããããããå®éã«è¿½å ãã¾ããã --file-ids-fromã¯æä¾ããããã¹ãããã¡ã¤ã«ã®idã®ä½¿ç¨ã試ã¿ã¾ãã ããã¯åããã¡ã¤ã«åãæã¡ããããããã£ã¬ã¯ããªã®çºè¦ãããããã«idãæ¢ããã¾ãç´ç²ãªãã¹ã«ãã£ã¦è¡ãã¾ãã ãã®ãªãã·ã§ã³ãå¿ è¦ã«ãªãã®ã¯ãã£ãã«ããã¾ããããå¾ã§ãã¼ã¸ãã2ã¤ã®ãã©ã³ãã«åãè«çãã¡ã¤ã«ã追å ãã ã¨ãã«ä¾¿å©ã§ã(2ã¤ã®ç°ãªã追å ãè¡çªã¨ãã¦è¡¨ç¤ºãã¾ãã)ã å¥ã®ããã¸ã§ã¯ãããã®ããã¸ã§ã¯ãã®ãµããã£ã¬ã¯ããªã«ãã¼ã¸ããéã«ã便å©ã§ãã :é¢é£ã³ãã³ã: `remove`_ alias ===== :ç®ç: ã¨ã¤ãªã¢ã¹ã®è¨å®/è¨å®è§£é¤ã¨è¡¨ç¤ºãè¡ãã :使ãæ¹: bzr alias [NAME] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã --remove ã¨ã¤ãªã¢ã¹ãåé¤ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :ä¾: ç¾å¨ã®ã¨ã¤ãªã¢ã¹ã表示ããã«ã¯:: bzr alias 'll'ç¨ã«æå®ãããã¨ã¤ãªã¢ã¹ã表示ããã«ã¯:: bzr alias ll 'll'ã®ã¨ã¤ãªã¢ã¹ãè¨å®ããã«ã¯:: bzr alias ll="log --line -r-10..-1" 'll'ã®ã¨ã¤ãªã¢ã¹ãåé¤ããã«ã¯:: bzr alias --remove ll annotate ======== :ç®ç: ãã¡ã¤ã«ã®ããããã®è¡ã®originã表示ããã :使ãæ¹: bzr annotate FILENAME :ãªãã·ã§ã³: --all ãã¹ã¦ã®è¡ã®æ³¨éã表示ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --long 注éã®ã³ãããæ¥æã表示ããã --show-ids å é¨ã®ãªãã¸ã§ã¯ãidã表示ããã -r ARG, --revision=ARG "help revisionspec"ã®è©³ç´°ãåç §ã :説æ: ãã®ã³ãã³ãã¯ä¸ãããããã¡ã¤ã«ã®ãå¤æ´ã«ãã£ã¦å°å ¥ããããªãã¸ã§ã³ã çè ã¨æ¥ä»ã示ã注éãå·¦å´ã§è¡¨ç¤ºãã¾ãã é£ç¶ããè¡ã®ç¶ãã«é¢ãã¦originãåãå ´åã --allãªãã·ã§ã³ã渡ãããªãéããããã¯ãããã§ã®ã¿è¡¨ç¤ºããã¾ãã :ã¨ã¤ãªã¢ã¹: ann, blame, praise bind ==== :ç®ç: ç¾å¨ã®ãã©ã³ããæä¾ããããã©ã³ãã®ãã§ãã¯ã¢ã¦ãã«å¤æããã :使ãæ¹: bzr bind [LOCATION] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãã§ãã¯ã¢ã¦ãã«å¤æãããã¨ãã³ãããã¯ãã¼ã«ã«ãã©ã³ãã«é©ç¨ãããåã« ã³ãããã¯ãã¹ã¿ã¼ãã©ã³ããç¶æ¿ããªããã°ãªãã¾ããã ãã¼ã«ã«ã«è¨å®ãããªãéããã¤ã³ãããããã©ã³ã㯠ãã¹ã¿ã¼ãã©ã³ãã®ããã¯ãã¼ã ã使ç¨ãã¾ãã ãã®å ´åããã¤ã³ãã£ã³ã°ã¯ãã¼ã«ã«ãªããã¯ãã¼ã ããã¹ã¿ã¼ã®ãã®ã«æ´æ°ãã¾ãã :é¢é£ã³ãã³ã: `checkout`_, `unbind`_ branch ====== :ç®ç: ãã©ã³ãã®æ°ããã³ãã¼ãä½æããã :使ãæ¹: bzr branch FROM_LOCATION [TO_LOCATION] :ãªãã·ã§ã³: --stacked ã½ã¼ã¹ãã©ã³ããåç §ããã¹ã¿ãã¯ããã©ã³ããä½æããã ãã¹ã¦ã®ãªãã¬ã¼ã·ã§ã³ã«é¢ã㦠æ°ãããã©ã³ãã¯ã½ã¼ã¹ãã©ã³ãã®å©ç¨å¯è½æ§ã«ä¾åããã -v, --verbose 詳細ãªæ å ±ã表示ããã --standalone å©ç¨å¯è½ã§ãã£ã¦ãå ±ç¨ãªãã¸ããªã使ç¨ããªãã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --hardlink å¯è½ãªä½æ¥ããªã¼ãã¡ã¤ã«ããã¼ããªã³ã¯ããã -r ARG, --revision=ARG 詳細㯠"help revisionspec" ãåç §ã :説æ: TO_LOCATIONãçç¥ãããã¨ãFROM_LOCATIONã®æçµã³ã³ãã¼ãã³ãã使ç¨ããã¾ãã è¨ãæããã¨ã "branch ../foo/bar" ã¯./bar ãä½æãããã¨ãã¾ãã FROM_LOCATIONã/ãæããªã ãããã¯åãè¾¼ã¿ã®ãã¹ã®åºåãæåãæã¤å ´å åé ã®ã¹ãã¼ã ãããã¯ãã©ã¤ãã®èå¥åãå¥ãåããã¨ã§ã FROM_LOCATIONããTO_LOCATIONãå¾ããã¾ãã ãã¨ãã°ã"branch lp:foo-bar"ã¯./foo-barãä½æãããã¨ãã¾ãã ãã©ã³ãã®ç¹å®ã®ãªãã¸ã§ã³ãèªã¿åãã«ã¯ã "branch foo/bar -r 5"ã®ãããªã--revisionãã©ã¡ã¼ã¿ãæä¾ãã¾ãã :ã¨ã¤ãªã¢ã¹: get, clone :é¢é£ã³ãã³ã: `checkout`_ break-lock ========== :ç®ç: ãªãã¸ããªããã©ã³ããããã¯ä½æ¥ãã£ã¬ã¯ããªã®ãããããã¯ããã¬ã¼ã¯ããã :使ãæ¹: bzr break-lock [LOCATION] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: è¦å: ããã¯ãä¿æããããã»ã¹ãåæ¢ããã¨ãã«ã®ã¿ããã¯ã¯ãã¬ã¼ã¯ãã¾ãã 'bzr info'ã³ãã³ããéãã¦éãã¦ããããã¯ã«é¢ããæ å ±ãå¾ããã¨ãã§ãã¾ãã :ä¾: bzr break-lock cat === :ç®ç: ä¸ãããããªãã¸ã§ã³ã®ãã¡ã¤ã«ã®å 容ãæ¨æºåºåã«æ¸ãè¾¼ãã :使ãæ¹: bzr cat FILENAME :ãªãã·ã§ã³: -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --name-from-revision å¤ãããªã¼ã®ãã¹åã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãªãã¸ã§ã³ãæå®ãããªããã°ãæå¾ã®ãªãã¸ã§ã³ã使ç¨ããã¾ãã 注æ: ãã¤ããªãã¡ã¤ã«ã§ãã®ã³ãã³ãã使ç¨ããéã«ã¯ æ¨æºåºåããªãã¤ã¬ã¯ãããããã«æ°ãã¤ãã¦ãã ããã :é¢é£ã³ãã³ã: `ls`_ check ===== :ç®ç: ä½æ¥ããªã¼ã®æ§é ããã©ã³ãã®ä¸è²«æ§ãã¨ãªãã¸ããªã®å±¥æ´ãããªãã¼ãããã :使ãæ¹: bzr check [PATH] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã --tree ç¾å¨ã®ãã£ã¬ã¯ããªã«é¢é£ããä½æ¥ããªã¼ããã§ãã¯ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã --repo ç¾å¨ã®ãã£ã¬ã¯ããªã«é¢é£ãããªãã¸ããªããã§ãã¯ããã --branch ç¾å¨ã®ãã£ã¬ã¯ããªã«é¢é£ãããã©ã³ãããã§ãã¯ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãã®ã³ãã³ãã¯ãã¼ã¿ã®ç ´æãããã¯bzrã®ãã°ãæ¤åºããããã« ãã©ã³ãã¨ãªãã¸ããªã¹ãã¬ã¼ã¸ã«é¢ãããã¾ãã¾ãªä¸å¤éããã§ãã¯ãã¾ãã» åé¡ãæ¤åºãããå ´åã®ã¿ä½æ¥ããªã¼ã¨ãã©ã³ãã®ãã§ãã¯ã¯åºåããã¾ãã ãªãã¸ããªãã§ãã¯ã®åºåãã£ã¼ã«ãã¯æ¬¡ã®ã¨ããã§ã: revisions: ããã¯ãã§ãã¯ããããªãã¸ã§ã³ã®çªå·ã§ãã ããã¯åé¡ã示ãã¾ããã versionedfiles: ããã¯ãã§ãã¯ããããã¼ã¸ã§ã³ç®¡çããããã¡ã¤ã«ã®æ°ã§ãã ããã¯åé¡ã示ãã¾ããã unreferenced ancestors: ä»ã®ããã¹ãã®ç¥å ã§ããããã¹ãã¯ã ãªãã¸ã§ã³ã®ç¥å ã«ãã£ã¦é©åã«åç §ããã¾ããã ããã¯Bazaarã対å¦ã§ããsubtleãªåé¡ã§ãã unique file texts: ãã§ãã¯ããããªãã¸ã§ã³ã§è¦ã¤ãã ãã¡ã¤ã«ã®å 容ã®åè¨æ°ã§ããããã¯åé¡ã示ãã¾ããã repeated file texts: ãã§ãã¯ããããªãã¸ã§ã³ã§è¦ã¤ããã ç¹°ãè¿ãããããã¹ãã®åè¨æ°ã§ãã ããã¹ãã®ã¨ã³ããªãä¿®æ£ãããã¨ãã«ããã¹ãã¯ç¹°ãè¿ãã§ãã¾ããã ãã¡ã¤ã«ã®å 容ã¯ç¹°ãè¿ãã§ãã¾ããã ããã¯åé¡ã示ãã¾ããã å¶éãæå®ãããªããã°ããã¹ã¦ã®Bazaarãã¼ã¿ã¯ãã§ãã¯ãããä½ç½®ã§è¦ã¤ããã¾ãã :ä¾: 'foo' ã§ã®ããªã¼ã¨ãã©ã³ãããã§ãã¯ãã:: bzr check --tree --branch foo 'bar'ã§ã®ãªãã¸ããªã®ã¿ããã§ãã¯ãã:: bzr check --repo bar 'baz' ã§ãã¹ã¦ããã§ãã¯ãã:: bzr check baz :é¢é£ã³ãã³ã: `reconcile`_ checkout ======== :ç®ç: æ¢åã®ãã©ã³ãã®æ°ãããã§ãã¯ã¢ã¦ããä½æããã :使ãæ¹: bzr checkout [BRANCH_LOCATION] [TO_LOCATION] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã --files-from=ARG ãã®ããªã¼ãããã¡ã¤ã«ã®å 容ãåå¾ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --hardlink å©ç¨å¯è½ãªä½æ¥ããªã¼ãã¡ã¤ã«ããã¼ããªã³ã¯ããã --lightweight 軽éãã§ãã¯ã¢ã¦ããå®è¡ããããªãã¬ã¼ã·ã§ã³ã«é¢ã㦠軽éãã§ãã¯ã¢ã¦ãã¯ãã©ã³ãã¸ã®æ¨©éã«ä¾åããã é常ã®ãã§ãã¯ã¢ã¦ãã¯diffãstatusã®ãããªã¢ã¯ã»ã¹ã ä¸è¦ãªå ±éã®ãªãã¬ã¼ã·ã§ã³ãå®è¡å¯è½ã§ã ãã¼ã«ã«ã³ãããããµãã¼ããã¾ãã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã :説æ: BRANCH_LOCATIONãçç¥ãããã¨ã'.'ã§è¦ã¤ãããã©ã³ãç¨ã« ãã§ãã¯ã¢ã¦ãã¯ä½æ¥ããªã¼ãåæ§æãã¾ãã ä½æ¥ããªã¼ãåé¤ããå ´åãããã¯ããããã£ãã¦ä½æãããªãå ´å - ããªãã¡ãSFTPã使ç¨ãã¦ãã©ã³ããç¾å¨ã®ä½ç½®ã«pushããå ´åãããã¯ä¾¿å©ã§ãã TO_LOCATIONãçç¥ãããã¨ãBRANCH_LOCATIONã®æå¾ã®ã³ã³ãã¼ãã³ãã使ç¨ããã¾ãã è¨ãæããã¨ã"checkout ../foo/bar" ã¯./barãä½æãããã¨ãã¾ãã BRANCH_LOCATIONã has no /ãæããªããããã¯ãã¹ã®åºåãæåãåãè¾¼ã¾ãã¦ããå ´åã å é ã®ã¹ãã¼ã ãããã¯ãã©ã¤ãã®èå¥åãé¤å»ãããã¨ã§BRANCH_LOCATIONããTO_LOCATIONã å¾ããã¾ãããã¨ãã°ã"checkout lp:foo-bar"ã¯./foo-barãä½æãããã¨ãã¾ãã ç¹å®ã®ãªãã¸ã§ã³ã®ãã©ã³ããèªã¿åãã«ã¯ã "checkout foo/bar -r 5"ã®ããã«--revisionãã©ã¡ã¼ã¿ãæä¾ãã¾ãã ããã¯ããã«æ代é ãã«ãªãã¾ãã[ãªã®ã§ã³ãããã§ããªã] å½¹ã«ç«ã¤ãã¨ãããã¾ã(ããªãã¡å¤ãã³ã¼ããæ¤æ»ãããã)ã :ã¨ã¤ãªã¢ã¹: co :é¢é£ã³ãã³ã: `branch`_, `ãã§ãã¯ã¢ã¦ã`_ commit ====== :ç®ç: å¤æ´ãæ°ãããªãã¸ã§ã³ã«ã³ãããããã :使ãæ¹: bzr commit [SELECTED...] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã --author=ARG èè ã®ååãã³ããã¿ã¼ã¨ã¯ç°ãªãå ´åãèè ã®ååãè¨å®ããã --unchanged ä½ãå¤æ´ããã¦ããªãã¦ãã³ãããããã --fixes=ARG ãã®ãªãã¸ã§ã³ããã°ãä¿®æ£ããããã®ã¨ãã¦ãã¼ã¯ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --show-diff ã¡ãã»ã¼ã¸ãæä¾ãããªãã¨ãã ã¡ãã»ã¼ã¸ã¨ãã£ã¿ã§ã¹ãã¼ã¿ã¹ã®è¦ç´ã¨ä¸ç·ã«å·®åã表示ããã --strict ä½æ¥ããªã¼ã®ä¸ã«æªç¥ã®ãã¡ã¤ã«ãåå¨ããå ´åã³ããããæå¦ããã -F MSGFILE, --file=MSGFILE ãã®ãã¡ã¤ã«ããã³ãããã¡ãã»ã¼ã¸ãåå¾ããã -x ARG, --exclude=ARG ä¸ãããããã¹ã¸ã®å¤æ´ãèæ ®ããªãã -m ARG, --message=ARG æ°ãããªãã¸ã§ã³ã®èª¬æã --local ãã¤ã³ãããããã©ã³ãã«ãã¼ã«ã«ã³ããããå®è¡ããã é常ã®ã³ããããå®è¡ãããã¾ã§ ãã¼ã«ã«ã³ãããã¯ãã¹ã¿ã¼ãã©ã³ãã«pushããã¾ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: å¼æ°ã渡ãããªããã°ãããªã¼å ¨ä½ãã³ãããããã¾ãã é¸æããããã¡ã¤ã«ãæå®ãããã¨ããããã®ãã¡ã¤ã«ã¸ã®å¤æ´ã®ã¿ãã³ãããããã¾ãã ãã£ã¬ã¯ããªãæå®ãããã¨ãã£ã¬ã¯ããªã¨ãã®ä¸ã®ãã¹ã¦ãã³ãããããã¾ãã excludesã渡ãããã¨ãããããã¯é¸æããããã¡ã¤ã«ãããåªå ããã¾ãã ãã¨ãã°ãfooã®ç¯å²ã§ã®å¤æ´ã®ã¿ã³ãããããã¾ãããfoo/barã®ç¯å²ã®å¤æ´ã¯ã³ãããããã¾ãã:: bzr commit foo -x foo/bar å¤æ´ã®èè ãã³ããã¿ã¼ã¨åã人ç©ã§ãªããã°ã --authorãªãã·ã§ã³ã使ç¨ãã¦èè ã®ååãæå®ã§ãã¾ãã ååã¯ã³ããã¿ã¼idã¨åããã©ã¼ãããã§ãããã¨ãã°"John Doe <jdoe@example.com>"ã§ãã ã³ããããããããªã¼ãç¡å¹ã§ããå ´åé¸æããããã¡ã¤ã«ã®ã³ãããã失æãããã¨ãããã¾ãã 次ã®ä¸é£ã®ã³ãã³ããèãã¦ã¿ã¾ããã:: bzr init foo mkdir foo/bar bzr add foo/bar bzr commit foo -m "committing foo" bzr mv foo/bar foo/baz mkdir foo/bar bzr add foo/bar bzr commit foo/bar -m "committing bar but not baz" ä¸è¨ã®ä¾ã«ããã¦ãæçµã³ãããã¯æ æã«å¤±æãã¾ãã ããã«ãã£ã¦ã¦ã¼ã¶ã¼ã¯ãåæã«ãæåã«åå¥ã«ããããã¯ã¾ã£ãã ãªãã¼ã ããããªããã©ããã決ããæ©ä¼ãå¾ã¾ãã (ä¸è¬çãªã«ã¼ã«ã¨ãã¦ãå¤æãã¤ããªãã¨ããBazaarã¯å®å ¨ã«ç©äºãè¡ãæ¹éãæã¡ã¾ãã) 注: ãã¼ã¸ã®å¾ã®é¸æããããã¡ã¤ã«ã®ã³ãããã¯ã¾ã ãµãã¼ãããã¦ãã¾ããã :ã¨ã¤ãªã¢ã¹: ci, checkin :é¢é£ã³ãã³ã: `bugs`_, `uncommit`_ conflicts ========= :ç®ç: è¡çªãæã¤ãã¡ã¤ã«ã®ä¸è¦§ã表示ããã :使ãæ¹: bzr conflicts :ãªãã·ã§ã³: --text ããã¹ãã®è¡çªãæã¤ãã¡ã¤ã«ã®ãã¹ã®ä¸è¦§ã表示ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãã¼ã¸ã¯2ã¤ã®ãã©ã³ãã®å¤æ´ãçµåããããã«æåãå°½ããã¾ããã 人éã ããä¿®æ£ã§ãããã種ã®åé¡ãåå¨ãã¾ãã ãã®åé¡ã«ééããã¨ããè¡çªããã¼ã¯ããã¾ãã è¡çªã¯ã³ãããããåã«ä½ããä¿®æ£ããå¿ è¦ããããã¨ãæå³ãã¾ãã é常ã®è¡çªã¯çã人éãèªããã¡ãã»ã¼ã¸ã¨ãã¦ä¸è¦§ã示ããã¾ãã --textãæä¾ãããå ´åã代ããã«ãããã¹ãã®è¡çªãæã¤ãã¡ã¤ã«ã®ãã¹ã®ä¸è¦§ã表示ããã¾ãã (ããã¯ããã¹ãã®è¡çªãæã¤ãã¡ã¤ã«ããã¹ã¦ç·¨éããããã«ä¾¿å©ã§ãã) åé¡ãä¿®æ£ãããbzr resolveã使ç¨ãã¾ãã :é¢é£ã³ãã³ã: `resolve`_ deleted ======= :ç®ç: ä½æ¥ããªã¼ã®ä¸ã§åé¤ããããã¡ã¤ã«ã®ä¸è¦§ã表示ããã :使ãæ¹: bzr deleted :ãªãã·ã§ã³: --show-ids å é¨ã®ãªãã¸ã§ã¯ãidã表示ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :é¢é£ã³ãã³ã: `ls`_, `status`_ diff ==== :ç®ç: ãªãã¸ã§ã³ãããã¯ãã©ã³ãã®éã®ãä½æ¥ããªã¼ã®ä¸ã®éãã表示ããã :使ãæ¹: bzr diff [FILE...] :ãªãã·ã§ã³: --old=ARG ããæ¯è¼ãããã©ã³ã/ããªã¼ã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -p ARG, --prefix=ARG ã³ãã³ã«ãã£ã¦åºåããã2ã¤ã®å¤ã¨ã㦠æ°æ§ã®ãã¡ã¤ã«åã«è¿½å ãããæ¥é è¾ãè¨å®ãã(ãã¨ãã°"old/:new/")ã --using=ARG ãã¡ã¤ã«ãæ¯è¼ããããã«ãã®ã³ãã³ãã使ç¨ããã --new=ARG ã¸æ¯è¼ãããã©ã³ã/ããªã¼ã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã --diff-options=ARG ãããã®ãªãã·ã§ã³ãå¤é¨diffããã°ã©ã ã«æ¸¡ãã -c ARG, --change=ARG æå®ããããªãã¸ã§ã³ã«ãã£ã¦å°å ¥ãããå¤æ´ãé¸æããã "help revisionspec"ãåç §ã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: å¼æ°ã渡ãããªããã°ãç¾å¨ã®ããªã¼ã«å¯¾ãããã¹ã¦ã®å¤æ´ã®ä¸è¦§ã表示ããã¾ãã ãã¡ã¤ã«ã渡ãããã°ããããã®ãã¡ã¤ã«ã®ä¸ã®å¤æ´ã®ä¸è¦§ã ãã表示ããã¾ãã ãªã¢ã¼ãã¨è¤æ°ã®ãã©ã³ãã¯--oldã¨--newãªãã·ã§ã³ã使ç¨ãã¦æ¯è¼ã§ãã¾ãã ãããã®ãªãã·ã§ã³ãæä¾ãããªããã°ã両æ¹ã®ããã©ã«ãã¯ãåå¨ããã°æåã®å¼æ°ã å¼æ°ã渡ãããªããã°ç¾å¨ã®ããªã¼ããå¾ããã¾ãã "bzr diff -p1" 㯠"bzr diff --prefix old/:new/"ã¨åçã§ã "patch -p1"ã«æé©ãªããããçæããã¾ãã :ä¾: ä½æ¥ããªã¼ã¨æçµã³ãããã®éã®éãã表示ãã:: bzr diff ä½æ¥ããªã¼ã¨ãªãã¸ã§ã³1ã®éã®éã:: bzr diff -r1 ãªãã¸ã§ã³1ã¨ãªãã¸ã§ã³2ã®éã®éã:: bzr diff -r1..2 ãã©ã³ãxxxã®ãªãã¸ã§ã³1ã¨ãªãã¸ã§ã³2ã®éã®éã:: bzr diff -r1..2 xxx NEWSãã¡ã¤ã«ã®éãã ã表示ãã:: bzr diff NEWS NEWSãã¡ã¤ã«ã«å¯¾ããä½æ¥ããªã¼ã®ä¸ã®éãã表示ãã:: bzr diff xxx/NEWS xxxãã©ã³ããããã®ä½æ¥ããªã¼ã®éãã表示ãã: bzr diff --old xxx NEWSãã¡ã¤ã«ã«å¯¾ãã2ã¤ã®ãã©ã³ãã®éãã表示ãã:: bzr diff --old xxx --new yyy NEWS 'bzr diff'ã¨åãã§ãããold/ã¨new/ã§ãã¹ã«æ¥é è¾ã追å ãã:: bzr diff --prefix old/:new/ :Exitã®å¤: 1 - å¤æ´ããã 2 - 表ç¾ã§ããªãå¤æ´ 3 - ã¨ã©ã¼ 0 - å¤æ´ãªã :ã¨ã¤ãªã¢ã¹: di, dif :é¢é£ã³ãã³ã: `status`_ export ====== :ç®ç: ç¾å¨ã®ãªãã¸ã§ã³ãæå®ããããã£ã¬ã¯ããªãããã¯ã¢ã¼ã«ã¤ãã«ã¨ã¯ã¹ãã¼ãããã :使ãæ¹: bzr export DEST [BRANCH_OR_SUBDIR] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã --format=ARG Type of file to export to. -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --root=ARG ã¨ã¯ã¹ãã¼ãããããã¡ã¤ã«å é¨ã®rootãã£ã¬ã¯ããªã®ååã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã :説æ: ãªãã¸ã§ã³ãæå®ãããªããã°ããã¯æçµã³ãããã®ãªãã¸ã§ã³ãã¨ã¯ã¹ãã¼ããã¾ãã ãã©ã¼ãããã¯tarãtgzãtbz2ã®ãããª"exporter"ã®ååã«ãªããã¨ãã§ãã¾ãã ä½ã渡ãããªããã°ãæ¡å¼µåãï½ãã©ã¼ããããè¦ã¤ãããã¨ãã¾ãã æ¡å¼µåãè¦ã¤ãããªããã°ãã£ã¬ã¯ããªã«ã¨ã¯ã¹ãã¼ããã¾ã(--format=dirã¨åç)ã rootãæä¾ãããã¨ãããã¯ã³ã³ãããã©ã¼ããã(tarãzipããã®ä»)å é¨ã®rootãã£ã¬ã¯ããªã¨ãã¦ä½¿ç¨ããã¾ãã ãããæä¾ãããªããã°ã¨ã¯ã¹ãã¼ãããããã¡ã¤ã«åã¸ã®ããã©ã«ãã«ãªãã¾ãã rootãªãã·ã§ã³ã¯'dir'ãã©ã¼ãããã«å¯¾ãã¦å¹æãããã¾ããã ãã©ã³ããçç¥ãããã¨ç¾å¨ã®ä½æ¥ãã£ã¬ã¯ããªãå«ããã©ã³ãã使ç¨ããã¾ãã 注: ASCIIã§ã¯ãªããã¡ã¤ã«åã§ã®ããªã¼ã®ã¨ã¯ã¹ãã¼ãã¯ãµãã¼ãããã¾ããã ========================== ========================= ãµãã¼ãããããã©ã¼ããã æ¡å¼µåã§èªåæ¤åº ========================== ========================= dir (none) tar .tar tbz2 .tar.bz2, .tbz2 tgz .tar.gz, .tgz zip .zip ========================== ========================= help ==== :ç®ç: ã³ãã³ããããã¯ä»ã®ãããã¯ã®ãã«ãã表示ããã :使ãæ¹: bzr help [TOPIC] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã --long ãã¹ã¦ã®ã³ãã³ãã®ãã«ãã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :ã¨ã¤ãªã¢ã¹: ?, --help, -?, -h :é¢é£ã³ãã³ã: topics ignore ====== :ç®ç: æå®ããããã¡ã¤ã«ãããã¯ãã¿ã¼ã³ãç¡è¦ããã :使ãæ¹: bzr ignore [NAME_PATTERN...] :ãªãã·ã§ã³: --old-default-rules bzr < 0.9ã§ä½¿ç¨ãããç¡è¦ã«ã¼ã«ãæ¸ãåºãã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãã¿ã¼ã³ã®æ§æã®è©³ç´°ã¯ ``bzr help patterns`` ãåç §ã ç¡è¦ãªã¹ããããã¿ã¼ã³ãé¤å¤ããã«ã¯ã.bzrignoreãã¡ã¤ã«ãç·¨éãã¾ãã 追å ããå¾ã§ãã³ãã³ãã使ç¨ãã¦éæ¥çã«ããããã¯ã¨ãã£ã¿ã使ç¨ã㦠ç´æ¥ãã®ãã¡ã¤ã«ãç·¨éãããã¯åé¤ããå¾ã§ããã®ã³ãããã確èªãã¦ãã ããã 注: ã·ã§ã«ã®ã¯ã¤ã«ãã«ã¼ããå«ãç¡è¦ãã¿ã¼ã³ã¯Unixã®ã·ã§ã«ããã¯ã©ã¼ããããªããã°ãªãã¾ããã :ä¾: ãããã¬ãã«ã®Makefileãç¡è¦ãã:: bzr ignore ./Makefile ãã¹ã¦ã®ãã£ã¬ã¯ããªã®ã¯ã©ã¹ãã¡ã¤ã«ãç¡è¦ãã:: bzr ignore "*.class" libãã£ã¬ã¯ããªä¸ã®.oãã¡ã¤ã«ãç¡è¦ãã:: bzr ignore "lib/**/*.o" libãã£ã¬ã¯ããªä¸ã®.oãã¡ã¤ã«ãç¡è¦ãã:: bzr ignore "RE:lib/.*\.o" "debian"ãããã¬ãã«ãã£ã¬ã¯ããªä»¥å¤ã®ãã¹ã¦ãç¡è¦ãã:: bzr ignore "RE:(?!debian/).*" :é¢é£ã³ãã³ã: `ignored`_, `ãã¿ã¼ã³`_, `status`_ ignored ======= :ç®ç: ç¡è¦ãããã¡ã¤ã«ã¨ãããã«ããããããã¿ã¼ã³ã®ä¸è¦§ã表示ããã :使ãæ¹: bzr ignored :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ç¡è¦ããããã¡ã¤ã«ã¨ç¡è¦ãã¿ã¼ã³ã®ãã¹ã¦ã®ä¸è¦§ã表示ãã¾ãã 代ããã«ãã¡ã¤ã«ã®ä¸è¦§ã ãã表示ããã«ã¯:: bzr ls --ignored :é¢é£ã³ãã³ã: `ignore`_, `ls`_ info ==== :ç®ç: ä½æ¥ããªã¼ããã©ã³ããããã¯ãªãã¸ããªã«é¢ããæ å ±ã表示ããã :使ãæ¹: bzr info [LOCATION] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãã®ã³ãã³ãã¯ããªã¼ããã©ã³ããããã¯ãªãã¸ããªã«é¢é£ããæ¢ç¥ã®ä½ç½®ã¨ãã©ã¼ãããã®ãã¹ã¦ã表示ãã¾ãã çµ±è¨æ å ±ã¯ããããã®ã¬ãã¼ãã«å«ã¾ãã¾ãã ãã©ã³ãã¨ä½æ¥ããªã¼ã¯è¦ã¤ãããªããªãã¸ã§ã³ãã¬ãã¼ããã¾ãã :é¢é£é ç®: `ãªãã¸ããª`_, `revno`_, `ä½æ¥ããªã¼`_ init ==== :ç®ç: ãã£ã¬ã¯ããªããã¼ã¸ã§ã³ç®¡çä¸ã«ãããã©ã³ãã«ããã :使ãæ¹: bzr init [LOCATION] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã --create-prefix ãã©ã³ãã«éãããã¹ãã¾ã åå¨ãã¦ããªããã°ãããä½æããã --append-revisions-only revnosãããã¯æ¢åã®ãã°ãå¤æ´ããªãã ãªãã¸ã§ã³ã追å ããã®ã¿ã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã ãã©ã³ãã®ãã©ã¼ããã:: --format=ARG ãã®ãã©ã³ãã®ãã©ã¼ããããæå®ããã"help formats"ãåç §ã --1.12-preview ãã¥ã¼ã¨ã³ã³ãã³ãã®ãã£ã«ã¿ãªã³ã°ããµãã¼ãããä½æ¥ããªã¼ãã©ã¼ãããã --1.12-preview-rich-root rich-rootãã¼ã¿ããµãã¼ããã1.12-previewã®ããªã¢ã³ã(bzr-svnã«å¿ è¦) --1.6 ã¹ã¿ãã¯ããµãã¼ããããªãã¸ããªã«åºã¥ãããã©ã³ãã¨ããã¯ã --1.6.1-rich-root ã¹ã¿ãã¯ã¨ãªãããªrootãã¼ã¿ããµãã¼ããããªãã¸ããªã«åºã¥ãã ãã©ã³ãã¨ããã¯(bzr-svnã«å¿ è¦)ã --1.9 btreeã¤ã³ããã¯ã¹ã使ç¨ãããªãã¸ããªã«åºã¥ãããã©ã³ãã¨ãã㯠--1.9-rich-root btreeã¤ã³ããã¯ã¹ã¨ãªããrootãã¼ã¿ã使ç¨ãã ãªãã¸ããªã«åºã¥ãããã©ã³ãã¨ããã¯(bzr-svnã«å¿ è¦)ã --default 0.92ã®æ°ããæ©è½: dirstate-tagsãã©ã¼ããããªãã¸ããªã¨ äºææ§ã®ãããã¼ã¿ãæã¤ããã¯ãã¼ã¹ã®ãã©ã¼ãããã 0.92以åã®bzrãªãã¸ããªã¨ç¸äºéç¨ãã¾ãã bzr < 0.92ã§ã¯èªããã¨ãã§ãã¾ããã 以åã¯knitpack-experimentalã¨å¼ã°ãã¦ãã¾ããã 詳細ãªæ å ±ã¯ http://doc.bazaar-vcs.org/latest/developers/packrepo.html ãåç §ã --development ç¾å¨ã®éçºãã©ã¼ãããããã¼ã¿ãpack-0.92 (ã¨pack-0.92ã¨äºææ§ã®ãã) ãã©ã¼ããããªãã¸ããªã«å¤æã§ããã ãã®ãã©ã¼ãããã®ãªãã¸ããªã¨ãã©ã³ãã¯bzr.devã«ãã£ã¦ã®ã¿èªã¿è¾¼ã¿ã§ãã¾ãã 使ç¨ããåã« http://doc.bazaar-vcs.org/latest/developers/development-repo.html ãåç §ãã¦é ããããé¡ããã¾ãã --development-subtree ç¾å¨ã®éçºãã©ã¼ãããã§ãsubtreeããªã¢ã³ãã ãã¼ã¿ãpack-0.92-subtree(ã¨pack-0.92-subtreeã¨äºææ§ã®ãã) ãã©ã¼ããããªãã¸ããªã«å¤æã§ããã ãã®ãã©ã¼ãããã®ãªãã¸ããªã¨ãã©ã³ãã¯bzr.devã§ã®ã¿èªã¿è¾¼ã¿ã§ããã 使ç¨ããåã« http://doc.bazaar-vcs.org/latest/developers/development- repo.html ãã覧ããã ããããé¡ããã¾ãã --dirstate 0.15ã®æ°ãããã©ã¼ããã: éããã¼ã«ã«ãªãã¬ã¼ã·ã§ã³ã ãããã¯ã¼ã¯ãéããã¢ã¯ã»ã¹ã®ã¨ãbzr 0.8ã¨ãã以éã¨äºææ§ãããã --dirstate-tags 0.15ã®æ°ãããã©ã¼ããã: éããã¼ã«ã«ãªãã¬ã¼ã·ã§ã³ã§ ãããã¯ã¼ã¯ãªãã¬ã¼ã·ã§ã³ã«é¢ããã¹ã±ã¼ãªã³ã°ãæ¹åã ã¿ã°ã®ãµãã¼ãã追å ãbzr < 0.15ã¨ã¯äºææ§ããªãã --knit knitsã使ç¨ãããã©ã¼ããããbzr <= 0.14ã¨ã®ç¸äºéç¨ã«æ¨å¥¨ã --metaweave 0.8ã§ã®æ«å®ãã©ã¼ããããknitãããé ãã --pack-0.92 0.92ã®æ°ãããã©ã¼ããã: dirstate-tagsãã©ã¼ããããªãã¸ããªã¨ äºææ§ã®ãããã¼ã¿ãæã¤ããã¯ãã¼ã¹ã®ãã©ã¼ãããã 0.92以åã®bzrãªãã¸ããªã¨ç¸äºéç¨ã§ãããbzr < 0.92.ã«ãã£ã¦èªã¿è¾¼ã¿ã§ããªãã 以åã¯knitpack-experimentalã¨å¼ã°ãã¦ããã 詳細ãªæ å ±ã«é¢ãã¦ã¯ã http://doc .bazaar-vcs.org/latest/developers/packrepo.html ãåç §ã --rich-root 1.0ã®æ°ãããã©ã¼ããããããªã¼rootã®ãã¿ã¼ãªæ±ãã bzr < 1.0ã¨äºææ§ããªãã --rich-root-pack 1.0ã®æ°ãããã©ã¼ããã: rich-rootãã¼ã¿ããµãã¼ããã pack-0.92ã®ããªã¢ã³ã(bzr-svnã«å¿ è¦)ã --weave 0.8以åã®ãã©ã¼ããããknitãããé ã ãã§ãã¯ã¢ã¦ããããã¯å ±ç¨ãªãã¸ããªããµãã¼ãããªãã :説æ: 空ã®ãã©ã³ããä½æãããããã¯æ¢åã®ããã¸ã§ã¯ããã¤ã³ãã¼ãããåã«ä½¿ç¨ãã¾ãã 親ãã£ã¬ã¯ããªã®ä½ç½®ã«ãªãã¸ããªãåå¨ããå ´åã ãã©ã³ãã®å±¥æ´ã¯ãªãã¸ããªã«ä¿åããã¾ãã ãããªããã°initã¯.bzrã®ãã£ã¬ã¯ããªã«ç¬èªã®å±¥æ´ãéã¶ã¹ã¿ã³ãã¢ãã³ã®ãã©ã³ããä½æãã¾ãã ãã±ã¼ã·ã§ã³ã«ãã©ã³ãããã§ã«ãããä½æ¥ããªã¼ããªãå ´åãããªã¼ã¯'bzr checkout'ã§æå ¥ã§ãã¾ãã ãã¡ã¤ã«ã®ããªã¼ãã¤ã³ãã¼ãããæ¹æ³ã®ã¬ã·ãã§ã:: cd ~/project bzr init bzr add . bzr status bzr commit -m "imported project" :é¢é£ã³ãã³ã: `branch`_, `checkout`_, `init-repository`_ init-repository =============== :ç®ç: ãã©ã³ããä¿æããå ±ç¨ãªãã¸ããªãä½æããã :使ãæ¹: bzr init-repository LOCATION :ãªãã·ã§ã³: --no-trees ãªãã¸ããªã®ãã©ã³ãã¯ããã©ã«ãã§ä½æ¥ããªã¼ãæã¡ã¾ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã ãã©ã³ãã®ãã©ã¼ããã:: --format=ARG ãã®ãã©ã³ãã®ãã©ã¼ããããæå®ããã"help formats"ãåç §ã --1.12-preview ãã¥ã¼ã¨ã³ã³ãã³ãã®ãã£ã«ã¿ãªã³ã°ããµãã¼ãããä½æ¥ããªã¼ãã©ã¼ãããã --1.12-preview-rich-root rich-rootãã¼ã¿ããµãã¼ããã1.12-previewã®ããªã¢ã³ã(bzr-svnã«å¿ è¦) --1.6 ã¹ã¿ãã¯ããµãã¼ããããªãã¸ããªã«åºã¥ãããã©ã³ãã¨ããã¯ã --1.6.1-rich-root ã¹ã¿ãã¯ã¨ãªãããªrootãã¼ã¿ããµãã¼ããããªãã¸ããªã«åºã¥ãã ãã©ã³ãã¨ããã¯(bzr-svnã«å¿ è¦)ã --1.9 btreeã¤ã³ããã¯ã¹ã使ç¨ãããªãã¸ããªã«åºã¥ãããã©ã³ãã¨ãã㯠--1.9-rich-root btreeã¤ã³ããã¯ã¹ã¨ãªããrootãã¼ã¿ã使ç¨ãã ãªãã¸ããªã«åºã¥ãããã©ã³ãã¨ããã¯(bzr-svnã«å¿ è¦)ã --default 0.92ã®æ°ããæ©è½: dirstate-tagsãã©ã¼ããããªãã¸ããªã¨ äºææ§ã®ãããã¼ã¿ãæã¤ããã¯ãã¼ã¹ã®ãã©ã¼ãããã 0.92以åã®bzrãªãã¸ããªã¨ç¸äºéç¨ãã¾ãã bzr < 0.92ã§ã¯èªããã¨ãã§ãã¾ããã 以åã¯knitpack-experimentalã¨å¼ã°ãã¦ãã¾ããã 詳細ãªæ å ±ã¯ http://doc.bazaar-vcs.org/latest/developers/packrepo.html ãåç §ã --development ç¾å¨ã®éçºãã©ã¼ãããããã¼ã¿ãpack-0.92 (ã¨pack-0.92ã¨äºææ§ã®ãã) ãã©ã¼ããããªãã¸ããªã«å¤æã§ããã ãã®ãã©ã¼ãããã®ãªãã¸ããªã¨ãã©ã³ãã¯bzr.devã«ãã£ã¦ã®ã¿èªã¿è¾¼ã¿ã§ãã¾ãã 使ç¨ããåã« http://doc.bazaar-vcs.org/latest/developers/development-repo.html ãåç §ãã¦é ããããé¡ããã¾ãã --development-subtree ç¾å¨ã®éçºãã©ã¼ãããã§ãsubtreeããªã¢ã³ãã ãã¼ã¿ãpack-0.92-subtree(ã¨pack-0.92-subtreeã¨äºææ§ã®ãã) ãã©ã¼ããããªãã¸ããªã«å¤æã§ããã ãã®ãã©ã¼ãããã®ãªãã¸ããªã¨ãã©ã³ãã¯bzr.devã§ã®ã¿èªã¿è¾¼ã¿ã§ããã 使ç¨ããåã« http://doc.bazaar-vcs.org/latest/developers/development- repo.html ãã覧ããã ããããé¡ããã¾ãã --dirstate 0.15ã®æ°ãããã©ã¼ããã: éããã¼ã«ã«ãªãã¬ã¼ã·ã§ã³ã ãããã¯ã¼ã¯ãéããã¢ã¯ã»ã¹ã®ã¨ãbzr 0.8ã¨ãã以éã¨äºææ§ãããã --dirstate-tags 0.15ã®æ°ãããã©ã¼ããã: éããã¼ã«ã«ãªãã¬ã¼ã·ã§ã³ã§ ãããã¯ã¼ã¯ãªãã¬ã¼ã·ã§ã³ã«é¢ããã¹ã±ã¼ãªã³ã°ãæ¹åã ã¿ã°ã®ãµãã¼ãã追å ãbzr < 0.15ã¨ã¯äºææ§ããªãã --knit knitsã使ç¨ãããã©ã¼ããããbzr <= 0.14ã¨ã®ç¸äºéç¨ã«æ¨å¥¨ã --metaweave 0.8ã§ã®æ«å®ãã©ã¼ããããknitãããé ãã --pack-0.92 0.92ã®æ°ãããã©ã¼ããã: dirstate-tagsãã©ã¼ããããªãã¸ããªã¨ äºææ§ã®ãããã¼ã¿ãæã¤ããã¯ãã¼ã¹ã®ãã©ã¼ãããã 0.92以åã®bzrãªãã¸ããªã¨ç¸äºéç¨ã§ãããbzr < 0.92.ã«ãã£ã¦èªã¿è¾¼ã¿ã§ããªãã 以åã¯knitpack-experimentalã¨å¼ã°ãã¦ããã 詳細ãªæ å ±ã«é¢ãã¦ã¯ã http://doc .bazaar-vcs.org/latest/developers/packrepo.html ãåç §ã --rich-root 1.0ã®æ°ãããã©ã¼ããããããªã¼rootã®ãã¿ã¼ãªæ±ãã bzr < 1.0ã¨äºææ§ããªãã --rich-root-pack 1.0ã®æ°ãããã©ã¼ããã: rich-rootãã¼ã¿ããµãã¼ããã pack-0.92ã®ããªã¢ã³ã(bzr-svnã«å¿ è¦)ã --weave 0.8以åã®ãã©ã¼ããããknitãããé ã ãã§ãã¯ã¢ã¦ããããã¯å ±ç¨ãªãã¸ããªããµãã¼ãããªãã :説æ: ãã©ã³ãã®ãã£ã¬ã¯ããªã§ã¯ãªãããªãã¸ããªã«ãªãã¸ã§ã³ãä¿åãã ãªãã¸ããªãã£ã¬ã¯ããªã®å ã§ä½æãããæ°ãããã©ã³ãã --no-treesãªãã·ã§ã³ã使ç¨ãããã¨ãªãã¸ããªã®ãã©ã³ãã¯ããã©ã«ãã§ä½æ¥ããªã¼ãæã¡ã¾ããã :ä¾: ãã©ã³ãã ããä¿æããå ±ç¨ãªãã¸ããªãä½æãã:: bzr init-repo --no-trees repo bzr init repo/trunk 軽éãã§ãã¯ã¢ã¦ããä½æãã:: bzr checkout --lightweight repo/trunk trunk-checkout cd trunk-checkout (add files here) :ã¨ã¤ãªã¢ã¹: init-repo :é¢é£é ç®: `branch`_, `checkout`_, `init`_, `ãªãã¸ããª`_ log === :ç®ç: ãã©ã³ãããã¡ã¤ã«ããããã¯ãã£ã¬ã¯ããªã®ãã°ã表示ããã :使ãæ¹: bzr log [LOCATION] :ãªãã·ã§ã³: -v, --verbose ããããã®ãªãã¸ã§ã³ã§å¤æ´ããããã¡ã¤ã«ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -l N, --limit=N åºåãæåã®Nã®ãªãã¸ã§ã³ã«å¶éããã --forward æå¤ããææ°ã¾ã§ã表示ããã --timezone=ARG ãã¼ã«ã«ããªãªã¸ãã«ãutcã®ã¿ã¤ã ã¾ã¼ã³ã表示ããã --show-ids å é¨ãªãã¸ã§ã¯ãidã表示ããã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã -m ARG, --message=ARG ã¡ãã»ã¼ã¸ãæ£è¦è¡¨ç¾ã«ããããããªãã¸ã§ã³ã表示ããã -c ARG, --change=ARG æå®ããããªãã¸ã§ã³ã ãã表示ããã"help revisionspec"ãåç §ã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã ãã°ã®ãã©ã¼ããã:: --log-format=ARG æå®ããããã°ãã©ã¼ãããã使ç¨ããã --line ãªãã¸ã§ã³åä½ã®1è¡ã®ãã°ãã©ã¼ããã --long 詳細ãªãã°ãã©ã¼ããã --short é©åã«çããã°ãã©ã¼ããã :説æ: ããã©ã«ãã§ã¯ä½æ¥ãã£ã¬ã¯ããªãå«ããã©ã³ãã®ãã°ã表示ããã ãã°ã®ç¯å²ããªã¯ã¨ã¹ãããã«ã¯ã-r begin..endã³ãã³ãã使ç¨ã§ãã¾ãã -r revisionã¯æå®ãããªãã¸ã§ã³ããªã¯ã¨ã¹ããã -r ..end ããã㯠-r begin.. ãæå¹ã§ãã :ä¾: ç¾å¨ã®ãã©ã³ãã®ãã°:: bzr log ãã¡ã¤ã«ã®ãã°:: bzr log foo.c ãã©ã³ãã®æå¾ã®10ãªãã¸ã§ã³ã®ãã°:: bzr log -r -10.. http://server/branch ls == :ç®ç: ããªã¼ã®ãã¡ã¤ã«ã®ä¸è¦§ã表示ããã :使ãæ¹: bzr ls [PATH] :ãªãã·ã§ã³: --from-root ãã©ã³ãã®rootããç¸å¯¾çãªãã¹ãåºåããã --ignored ç¡è¦ããããã¡ã¤ã«ãåºåããã --kind=ARG ç¹å®ã®ç¨®é¡:fileãdirectoryãsymlinkã®ã¨ã³ããªã®ä¸è¦§ã表示ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -V, --versioned ãã¼ã¸ã§ã³ç®¡çããããã¡ã¤ã«ãåºåããã --unknown æªç¥ã®ãã¡ã¤ã«ãåºåããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --non-recursive ãµããã£ã¬ã¯ããªã§å帰çå¦çãè¡ããªãã --show-ids å é¨ãªãã¸ã§ã¯ãidã表示ããã --null ãã¡ã¤ã«ã®éã«æ¹è¡ã®ä»£ããã« NUL (\0) åºåãæåãæ¸ãã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã :é¢é£é ç®: `cat`_, `status`_ merge ===== :ç®ç: ä¸æ¹åãã¼ã¸ãå®è¡ããã :使ãæ¹: bzr merge [LOCATION] :ãªãã·ã§ã³: --pull ãã§ã«å¯¾è±¡ãå®å ¨ã«ã½ã¼ã¹ã«ãã¼ã¸ãããå ´åã ãã¼ã¸ãããã½ã¼ã¹ããpullããã ãããèµ·ããã¨ããçµæãã³ãããããå¿ è¦ã¯ãªãã --remember æå®ããããã±ã¼ã·ã§ã³ãããã©ã«ãã¨ãã¦è¨é²ããã --force ç®çã®ããªã¼ãã³ãããããã¦ããªãå¤æ´ãæã£ã¦ãã¦ããã¼ã¸ããã -v, --verbose 詳細ãªæ å ±ã表示ããã --reprocess 誤ã£ãè¡çªãæ¸ããããã«åå¦çããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --uncommitted ãã©ã³ãã®å¤æ´ã®ä»£ããã«ãä½æ¥ããªã¼ããã³ãããããã¦ããªãå¤æ´ãé©ç¨ããã -d ARG, --directory=ARG ä½æ¥ãã£ã¬ã¯ããªãå«ããã®ãããããã¼ã¸ãããã©ã³ãã --show-base è¡çªã®ãã¼ã¹ãªãã¸ã§ã³ããã¹ãã表示ããã --preview ãã¼ã¸ãã代ããã«ããã¼ã¸ã®å·®åã表示ããã -c ARG, --change=ARG æå®ããããªãã¸ã§ã³ã§å°å ¥ãããå¤æ´ãé¸æããã "help revisionspec"ãåç §ã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã ãã¼ã¸ã¢ã«ã´ãªãºã :: --merge-type=ARG ç¹å®ã®ãã¼ã¸ã¢ã«ã´ãªãºã ãé¸æããã --diff3 å¤é¨diff3ã使ç¨ãããã¼ã¸ --lca æ°ããLCAãã¼ã¸ --merge3 ãã¤ãã£ãã®diff3ã¹ã¿ã¤ã«ã®ãã¼ã¸ --weave weaveãã¼ã¹ã®ãã¼ã¸ :説æ: ãã¼ã¸ã®ã½ã¼ã¹ã¯ãã©ã³ãã®å½¢å¼ããããã¯bzr sendã§çæããã mergeãã£ã¬ã¯ãã£ããå«ããã¡ã¤ã«ã¸ã®ãã¹ã®å½¢å¼ã§æå®ã§ãã¾ãã ã©ã¡ããæå®ãããªããã°ãããã©ã«ãã¯ä¸æµãã©ã³ãããã㯠--rememberã使ç¨ãã¦æè¿ãã¼ã¸ããããã©ã³ãã§ãã ãã¼ã¸ããã©ã³ãããã¨ããããã©ã«ãã§ã¯ãããããã¼ã¸ããã¾ãã ç°ãªããªãã¸ã§ã³ãããã¯ããã«ã¯ã--revisionã渡ãã¾ãã 2ã¤ã®å¤ãæå®ããå ´åãæåã®å¤ã¯BASEã¨ãã¦ã2çªç®ã®å¤ã¯OTHERã¨ãã¦ä½¿ç¨ããã¾ãã åå¥ã®ãªãã¸ã§ã³ããããã¯ãã®ããã«å©ç¨å¯è½ãªãªãã¸ã§ã³ã®ãµãã»ããããã¼ã¸ãããã¨ã¯ ä¸è¬çã«"ãã§ãªã¼ããã¯"ã¨ãã¦è¨åããã¾ãã ãªãã¸ã§ã³çªå·ã¯ãã¼ã¸ããããã©ã³ãã«å¯¾ãã¦å¸¸ã«ç¸å¯¾çã§ãã ããã©ã«ãã§ã¯ãbzrã¯ãèªåçã«é©åãªãã¼ã¹ãæ¤åºãã¦ã ä»ã®ãã©ã³ããããã¹ã¦ã®ãããã¯ã¼ã¯ã§ãã¼ã¸ãããã¨ãã¾ãã ããã失æããã¨ãæ示çãªãã¼ã¹ã渡ããã¨ãå¿ è¦ã«ãªããã¨ãããã¾ãã ãã¼ã¸ã¯2ã¤ã®ãã©ã³ãã®å¤æ´ãçµåããããã«æåãå°½ããã¾ããã 人éã ããä¿®æ£ã§ãã種é¡ã®åé¡ãããã¾ãã ãã®åé¡ã«ééããã¨ããè¡çªãã¼ã¯ãã¤ãããã¾ãã è¡çªã¯ã³ãããããåã«ä½ããä¿®æ£ããå¿ è¦ããããã¨ãæå³ãã¾ãã åé¡ãä¿®æ£ãããbzr resolveã使ç¨ãã¾ããbzr conflictsãåç §ãã¦ãã ããã ããã©ã«ãã®ãã©ã³ãã»ãããåå¨ããªãå ´åãæåã®ãã¼ã¸ã¯ãããè¨å®ãã¾ãã ãã®å¾ã§ãããã©ã«ãã使ç¨ãããã©ã³ããçç¥ã§ãã¾ãã ããã©ã«ããå¤æ´ããã«ã¯ã--rememberã使ç¨ãã¾ãã ãªã¢ã¼ããã±ã¼ã·ã§ã³ãã¢ã¯ã»ã¹å¯è½å ´åã®ã¿å¤ã¯ä¿åããã¾ãã ãã¼ã¸ã®çµæã¯ç®çã®ä½æ¥ãã£ã¬ã¯ããªã«è¨ç½®ããã¾ãã ãã®ãã£ã¬ã¯ããªã¯(bzr diffã§)é²è¦§ããã¹ãã ã¨ãã¼ã¸ã®çµæãè¨é²ããããã«ã³ãããå¯è½ã§ãã --forceã渡ãããªãéããã³ãããããã¦ããªãå¤æ´ãåå¨ããã°ãã¼ã¸ã®å®è¡ã¯æå¦ããã¾ãã :ä¾: bzr.devããææ°ã®ãªãã¸ã§ã³ããã¼ã¸ããã«ã¯:: bzr merge ../bzr.dev bzr.devãããªãã¸ã§ã³82ãå«ãã¦å¤æ´ããã¼ã¸ããã«ã¯:: bzr merge -r 82 ../bzr.dev 以åã®å¤æ´ãªãã«ã82ã§å°å ¥ãããå¤æ´ããã¼ã¸ããã«ã¯:: bzr merge -r 81..82 ../bzr.dev /tmp/mergeã«å«ã¾ããmergeãã£ã¬ã¯ããªãé©ç¨ããã«ã¯: bzr merge /tmp/merge :é¢é£é ç®: `remerge`_, `status-flags`_, `update`_ missing ======= :ç®ç: 2ã¤ã®ãã©ã³ãã®éã®mergeããã¦ããªã/pullããã¦ããªã ãªãã¸ã§ã³ã表示ããã :使ãæ¹: bzr missing [OTHER_BRANCH] :ãªãã·ã§ã³: --reverse ãªãã¸ã§ã³ã®é åºããªãã¼ã¹ããã --this --mine-onlyã¨åãã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã --other --theirs-onlyã¨åãã --include-merges ãã¼ã¸ããããªãã¸ã§ã³ã表示ããã --mine-only ãã¼ã«ã«ãã©ã³ãã®å¤æ´ã®ã¿ã表示ããã --show-ids å é¨ãªãã¸ã§ã¯ãidã表示ããã --theirs-only ãªã¢ã¼ããã©ã³ãã®å¤æ´ã®ã¿ã表示ããã -v, --verbose 詳細ãªæ å ±ã表示ããã ãã°ãã©ã¼ããã:: --log-format=ARG æå®ãããã°ãã©ã¼ãããã使ç¨ããã --line ãªãã¸ã§ã³ãã¨ã®1è¡ã®ãã°ãã©ã¼ããã --long 詳細ãªãã°ãã©ã¼ããã --short é©åã«çããã°ãã©ã¼ããã :説æ: OTHER_BRANCHã¯localãããã¯remoteã«ãªãã¾ãã :é¢é£é ç®: `merge`_, `pull`_ mkdir ===== :ç®ç: ãã¼ã¸ã§ã³ç®¡çä¸ã«ããæ°ãããã£ã¬ã¯ããªãä½æããã :使ãæ¹: bzr mkdir DIR... :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ããã¯ãã£ã¬ã¯ããªã®ä½æã¨è¿½å ã¨åçã§ãã mv == :ç®ç: ãã¡ã¤ã«ã移åãããã¯ãªãã¼ã ããã :使ãæ¹: bzr mv OLDNAME NEWNAME bzr mv SOURCE... DESTINATION :ãªãã·ã§ã³: --after ãã¡ã¤ã«ããã§ã«ç§»åãã¦ããã®ã§ããã¡ã¤ã«ã®bzrèå¥åã®ã¿ã移åãããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: æå¾ã®å¼æ°ããã¼ã¸ã§ã³ç®¡çããã¦ãããã£ã¬ã¯ããªã®å ´åã ä»ã®ãã¹ã¦ã®ååã¯ããã«ç§»åãã¾ãã ãããªããã°ã2ã¤ã®å¼æ°ã ãã«ããªããã°ãªãã ãã¡ã¤ã«ã¯æ°ããååã«å¤æ´ããã¾ãã OLDNAMEããã¡ã¤ã«ã·ã¹ãã ä¸ã«åå¨ããªãããã¼ã¸ã§ã³ç®¡çããã¦ã㦠NEWNAMEã¯ãã¡ã¤ã«ã·ã¹ãã ä¸ã«åå¨ãããã¼ã¸ã§ã³ç®¡çãããã¦ããªãå ´åã mvã¯ãã¡ã¤ã«ãæåã§ç§»åãããããã®å¤æ´ãåæ ããããã« å é¨ã¤ã³ãã³ããªã ããæ´æ°ãããã¨ãæ³å®ãã¾ãã å¤ãã®SOURCEãã¡ã¤ã«ãDESTINATIONã«ç§»åãããã¨ããåãã§ãã ãã©ã³ãã®éã§ãã¡ã¤ã«ã移åããããã¨ã¯ã§ãã¾ããã :ã¨ã¤ãªã¢ã¹: move, rename nick ==== :ç®ç: ãã©ã³ãã®ããã¯ãã¼ã ã表示ãããã¯è¨å®ããã :使ãæ¹: bzr nick [NICKNAME] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: è¨å®ã解é¤ãããã¨ãããªã¼ã®rootãã£ã¬ã¯ããªã®ååãããã¯ãã¼ã ã¨ãã¦ä½¿ç¨ããã¾ãã ç¾å¨ã®ããã¯ãã¼ã ã表示ããã«ã¯ãå¼æ°ãªãã§å®è¡ãã¾ãã ãã¼ã«ã«ã«è¨å®ããã¦ããªãéããã¤ã³ãããããã©ã³ãã¯ãã¹ã¿ã¼ãã©ã³ãã®ããã¯ãã¼ã ã使ç¨ãã¾ãã :é¢é£ã³ãã³ã: `info`_ pack ==== :ç®ç: ãªãã¸ããªå ã®ãã¼ã¿ãå§ç¸®ããã :使ãæ¹: bzr pack [BRANCH_OR_REPO] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :é¢é£ã³ãã³ã: `ãªãã¸ããª`_ plugins ======= :ç®ç: ã¤ã³ã¹ãã¼ã«ããããã©ã°ã¤ã³ã®ä¸è¦§ã表示ããã :使ãæ¹: bzr plugins :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãã®ã³ãã³ãã¯ãã©ã°ã¤ã³ã®ãã¼ã¸ã§ã³ã¨ããããã®æçãªèª¬æãå«ã㦠ã¤ã³ã¹ãã¼ã«ããããã©ã°ã¤ã³ã®ä¸è¦§ã表示ãã¾ã --verboseã¯ããããã®ãã©ã°ã¤ã³ãè¨ç½®ããããã¹ã表示ãã¾ãã ãã©ã°ã¤ã³ã¯ã³ã¼ãã追å ãããç½®ãæããããããã¨ã§ ãªãã¸ã§ã³ç®¡çã·ã¹ãã ãæ¡å¼µããå¤é¨ã³ã³ãã¼ãã³ãã§ãã ã³ãã³ãã®ä¸æ¸ããæ°ããã³ãã³ãã®è¿½å ã追å ã®ãããã¯ã¼ã¯è»¢éã®æä¾ã ãã°åºåã®ã«ã¹ã¿ãã¤ãºãªã©ãå«ã㦠ãã©ã°ã¤ã³ã¯ãã¾ãã¾ãªãã¨ãè¡ããã¨ãã§ãã¾ãã ãã©ã°ã¤ã³ãè¦ã¤ãã¦ã¤ã³ã¹ãã¼ã«æ¹æ³ãå«ãã詳細ãªæ å ±ã«é¢ãã¦ã¯ã Bazaarã®ã¦ã§ããµã¤ããhttp://bazaar-vcs.org ãåç §ãã¦ãã ããã ããã°ã©ãã³ã°è¨èªã®Pyhonãå©ç¨ã㦠æ°ããã³ãã³ããä½æããæ¹æ³ã«é¢ããæå¼ããããã¾ãã pull ==== :ç®ç: ãã®ãã©ã³ããå¥ã®ãã©ã³ãã®ãã©ã¼ã«ããã :使ãæ¹: bzr pull [LOCATION] :ãªãã·ã§ã³: -v, --verbose pullããããªãã¸ã§ã³ç¨ã®ãã°ã表示ããã --remember ããã©ã«ãã¨ãã¦æå®ããããã±ã¼ã·ã§ã³ãè¨é²ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -d ARG, --directory=ARG ä½æ¥ãã£ã¬ã¯ããªãå«ããã®ãããpullãããã©ã³ãã --overwrite ãã©ã³ãã®éã®éããç¡è¦ãã¦ç¡æ¡ä»¶ã§ä¸æ¸ãããã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã :説æ: ãã®ã³ãã³ãã¯åå²ããã¦ããªããã©ã³ãã®ã¿ã§åä½ãã¾ãã ç®çã®ãã©ã³ãã®ææ°ã®å¤æ´ã³ãããã親ã«ãã¼ã¸ãããªãã£ãå ´å(ç´æ¥ãããã¯éæ¥)ã ãã©ã³ãã¯åå²ãããã®ã¨ãã¦è¦ãªããã¾ãã ãã©ã³ããåå²ãã¦ããã°ããããã©ã³ãããã®å¤æ´ãä»ã®ãã©ã³ãã«çµ±åããããã« 'bzr merge'ã使ç¨ã§ãã¾ãã ä¸æ¦ãããã©ã³ãããã¼ã¸ãããã¨ãä»ã®ãã©ã³ãã¯åã³ãããpullã§ããããã«ãªãã¾ãã ãã¼ã«ã«ã®å¤æ´ãå¿ãã¦ãªã¢ã¼ããã©ã³ããæºããããã«ãã©ã³ããæ´æ°ãããã ããªãã pull --overwriteã使ç¨ãã¾ãã ããã©ã«ãã®ãã±ã¼ã·ã§ã³ãåå¨ããªãå ´åãæåã®pullã¯ãããè¨å®ãã¾ãã ãã®å¾ã§ãããã©ã«ãã使ç¨ãããã±ã¼ã·ã§ã³ãçç¥ã§ãã¾ãã ããã©ã«ããå¤æ´ããã«ã¯ã--rememberã使ç¨ãã¾ãã ãªã¢ã¼ããã±ã¼ã·ã§ã³ãã¢ã¯ã»ã¹ã§ããå ´åã®ã¿å¤ã¯ä¿åããã¾ãã 注: ä½ç½®ããã©ã³ãã®ãã©ã¼ããããããã¯bzr sendã§çæãããmergeãã£ã¬ã¯ããªãæ ¼ç´ãã ãã¡ã¤ã«ã¸ã®ãã¹ã§æå®ã§ãã¾ãã :é¢é£é ç®: `push`_, `status-flags`_, `update`_ push ==== :ç®ç: ãã®ãã©ã³ãã®ãã©ã¼ãæ´æ°ããã :使ãæ¹: bzr push [LOCATION] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã --remember æå®ãããä½ç½®ãããã©ã«ãã¨ãã¦è¦ããã --create-prefix ã¾ã åå¨ããªãã°ãã©ã³ãã¸ã®ãã¹ãä½æããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --stacked-on=ARG ã³ãããã®å±¥æ´ã«é¢ãã¦å¥ã®ãã©ã³ããåç §ããã¹ã¿ãã¯ããã©ã³ããä½æããã åç §ããããã©ã³ãã«åå¨ããªãä½æ¥å 容ã¯ä½æããããã©ã³ãã«æ ¼ç´ãããã --use-existing-dir ããã©ã«ãã§ã¯ãã¿ã¼ã²ããã®ãã£ã¬ã¯ããªãåå¨ããã ã¾ã ã³ã³ããã¼ã«ãã£ã¬ã¯ããªãæããªãå ´åpushã¯å¤±æããã ãã®ãã©ã°ã¯pushã®ç¶è¡ãå¯è½ã«ããã -d ARG, --directory=ARG ä½æ¥ãã£ã¬ã¯ããªãå«ããã©ã³ãããããpushãããã©ã³ã --stacked 親ãã©ã³ãã®å ¬éä½ç½®ãåç §ããã¹ã¿ãã¯ããã©ã³ããä½æããã --overwrite ãã©ã³ãéã®éããç¡è¦ãã¦ç¡æ¡ä»¶ã«ä¸æ¸ãããã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã :説æ: ããã¯å²é«ã§ãªã¢ã¼ããã¡ã¤ã«ã·ã¹ãã ã§ã¯ãµãã¼ããããªãã®ã§ã ã¿ã¼ã²ãããã©ã³ãã¯æå ¥ãããä½æ¥ããªã¼ãæã¡ã¾ããã ã¹ãã¼ããµã¼ãã¼ãããã¯ãããã³ã«ã®ä¸ã«ã¯å°æ¥ä½æ¥ããªã¼ãå°å ¥ããªããã®ãããã¾ãã ãã®ã³ãã³ãã¯åå²ããã¦ããªããã©ã³ãã§ã®ã¿åä½ãã¾ãã ç®çã®ãã©ã³ãã®ææ°ã®ã³ããããã½ã¼ã¹ãã©ã³ãã«ãã£ã¦(ç´æ¥ãããã¯éæ¥çã«)ãã¼ã¸ãããªããã° ãã©ã³ãã¯åå²ããããã®ã¨ãã¦è¦ãªããã¾ãã ãã©ã³ããåå²ãããã¨ãä»ã®ãã©ã³ããå®å ¨ã«ç½®ãæããããã« 'bzr push --overwrite'ã使ç¨ã§ãã¾ãããã®å ´åããã¼ã¸ããã¦ããªãå¤æ´ã¯å»æ£ããã¾ãã ä»ã®ãã©ã³ãã«ç°ãªãå¤æ´ããããã¨ãä¿è¨¼ãããå ´åã¯ã ä»ã®ãã©ã³ããããã¼ã¸ãè¡ã(bzr help mergeãåç §)ããããã³ããããã¾ãã ãã®å¾ã§'--overwrite'ãªãã§pushãè¡ããã¨ãã§ããããã«ãªãã¾ãã ããã©ã«ãã®pushä½ç½®ã®è¨å®ããªããã°ãæåã®pushã¯ãããè¨å®ãã¾ãã ãã®å¾ã§ã¯ãããã©ã«ããçç¥ã§ãã¾ãã ããã©ã«ããå¤æ´ããã«ã¯ã--rememberã使ç¨ãã¾ãã ãªã¢ã¼ãä½ç½®ãã¢ã¯ã»ã¹ã§ããå ´åã®ã¿å¤ã¯ä¿åããã¾ãã :é¢é£é ç®: `pull`_, `update`_, `working-trees`_ reconcile ========= :ç®ç: ãã©ã³ãã®ã¡ã¿ãã¼ã¿ã調æ´ããã :使ãæ¹: bzr reconcile [BRANCH] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ããã¯ä»¥åã®å®å¨ããªããªãã¬ã¼ã·ã§ã³ãããã¯bzrã®æ´æ°ã«ãã£ã¦ å¼ãèµ·ãããããã¼ã¿ã®ãã¹ããããè¨æ£ã§ãã¾ãã 'bzr check'ãããã¯bzrã®éçºè ããã®ã³ãã³ããå®è¡ããããã«ã¢ããã¤ã¹ããã®ã§ããã°ã ãã®ã³ãã³ããå®è¡ãããã¨ã ããå¿ è¦ã«ãªãã¾ãã 2çªç®ã®ãã©ã³ããæä¾ãããã¨ã ãã©ã³ããã¾ããã調æ´ãè¡ããã¾ããããã«ãã£ã¦bzrã®åæã®ãã¼ã¸ã§ã³ã§ã¯åå¨ããªãã£ã ããªã¼ã®root idã®ãããªãã¼ã¿ããã§ãã¯ããã両æ¹ã®ãã©ã³ãã§æ£ãã表示ããã¾ãã åæã«ãã¼ã¿ãåå§ç¸®ãããã®ã§ãã£ã¹ã¯ã¹ãã¼ã¹ã®ç¯ç´ãããã©ã¼ãã³ã¹ã®ã²ã¤ã³ã«ã¤ãªããã¾ãã ãã©ã³ãã¯ãã¼ã«ã«ãã£ã¹ã¯ãããã¯sftpã®ããã«ãªã¹ãå¯è½ãªã·ã¹ãã ä¸ã«ãªããã°ãªãã¾ããã :é¢é£é ç®: `check`_ reconfigure =========== :ç®ç: bzrãã£ã¬ã¯ããªã®ã¿ã¤ããåè¨å®ããã :使ãæ¹: bzr reconfigure [LOCATION] :ãªãã·ã§ã³: --force ãã¼ã«ã«ã®å¤æ´ã失ããã¦ããå ´åã§ãåè¨å®ãå®è¡ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --bind-to=ARG ãã§ãã¯ã¢ã¦ãããã¤ã³ããããã©ã³ãã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã Target type: --branch ä½æ¥ããªã¼ãæããªããã¤ã³ãããã¦ããªããã©ã³ãã«åè¨å®ããã --checkout ä½æ¥ããªã¼ãæã¤ãã¤ã³ãããããã©ã³ãã«åè¨å®ããã --lightweight-checkout 軽éãã§ãã¯ã¢ã¦ãã«åè¨å®ãã(ãã¼ã«ã«ã®å±¥æ´ã¯ãªã)ã --standalone ã¹ã¿ã³ãã¢ãã³ãã©ã³ãã«åè¨å®ãã(ããªãã¡å ±ç¨ãªãã¸ããªã®ä½¿ç¨ãåæ¢ãã)ã --tree ä½æ¥ããªã¼ãæã¤ãã¤ã³ãããã¦ããªããã©ã³ãã«åè¨å®ããã --use-shared å ±ç¨ãªãã¸ããªã使ç¨ããããã«åè¨å®ããã :説æ: ã¿ã¼ã²ããã®è¨å®ãæå®ããªããã°ãªãã¾ããã ãã§ãã¯ã¢ã¦ãã«é¢ãã¦ã¯æå®ããã¦ããªããã°ãbind-toã®ãã±ã¼ã·ã§ã³ã¯èªåæ¤åºããã¾ãã åªå é ä½ã¯ 1. 軽éãã§ãã¯ã¢ã¦ãã«é¢ãã¦ã¯ãç¾å¨ãã¤ã³ãããã¦ãããã±ã¼ã·ã§ã³ã 2. ãã§ãã¯ã¢ã¦ãã«ä½¿ç¨ããããã©ã³ãã«é¢ãã¦ã¯ã以åãã¤ã³ãããããã±ã¼ã·ã§ã³ã 3. pushã®ãã±ã¼ã·ã§ã³ã 4. 親ã®ãã±ã¼ã·ã§ã³ã ããããå©ç¨ã§ããªããã°ã--bind-toãæå®ããªããã°ãªãã¾ããã :é¢é£é ç®: `ãã©ã³ã`_, `ãã§ãã¯ã¢ã¦ã`_, `ã¹ã¿ã³ãã¢ãã³ã®ããªã¼`_, `ä½æ¥ããªã¼`_ remerge ======= :ç®ç: ãã¼ã¸ãåã³è¡ãã :使ãæ¹: bzr remerge [FILE...] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã --reprocess 誤ã£ãè¡çªãæ¸ããããã«åå¦çããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿è¡¨ç¤ºããã --show-base è¡çªå ã®ãã¼ã¹ãªãã¸ã§ã³ã®ããã¹ãã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã ãã¼ã¸ã¢ã«ã´ãªãºã : --merge-type=ARG ç¹å®ã®ãã¼ã¸ã¢ã«ã´ãªãºã ãæå®ããã --diff3 å¤é¨diff3ã使ç¨ãããã¼ã¸ --lca æ°ããLCAãã¼ã¸ --merge3 ãã¤ãã£ãã®diff3ã¹ã¿ã¤ã«ã®ãã¼ã¸ --weave weaveãã¼ã¹ã®ãã¼ã¸ :説æ: è¡çªã解æ¶ãã¦ããéã«ç°ãªããã¼ã¸ãã¯ããã¯ã試ãããå ´åã¯ããã使ç¨ãã¾ãã ãã¼ã¸ãã¯ããã¯ã®ä¸ã«ã¯ä»ã®ãã®ããããããããã®ãããã remergeã«ãã£ã¦ç°ãªããã¡ã¤ã«ã§ç°ãªããã¯ããã¯ã試ããã¨ãã§ãã¾ãã remergeã®ãªãã·ã§ã³ã¯mergeã®ãã®ã¨åãæå³ã¨ããã©ã«ããæã¡ã¾ãã éãã¯æªè§£æ±ºã®ãã¼ã¸ãåå¨ããã¨ãã®ã¿remergeã¯å®è¡ã§ã㦠ç¹å®ã®ãã¡ã¤ã«ãæå®ã§ãããã¨ã§ãã :ä¾: ãã¹ã¦ã®ãã¡ã¤ã«ã®ãã¼ã¸ãåå®è¡ããé常ã®THISã¨OTHERããã¹ãã«å ãã¦ã è¡çªé åã®ãã¼ã¹ããã¹ãã表示ãã:: bzr remerge --show-base weaveãã¼ã¸ã¢ã«ã´ãªãºã ã使ç¨ãã¦"foobar"ã®ãã¼ã¸ãåå®è¡ãã¦ã è¡çªé åã®ãµã¤ãºãæ¸ããããã«è¿½å å¦çãè¡ã:: bzr remerge --merge-type weave --reprocess foobar remove ====== :ç®ç: ãã¡ã¤ã«ãããã¯ãã£ã¬ã¯ããªãé¤å¤ããã :使ãæ¹: bzr remove [FILE...] :ãªãã·ã§ã³: --new ãã£ãã¦ã³ããããããªãã£ããã¡ã¤ã«ã®ã¿ãé¤å¤ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã åé¤æ¦ç¥: --force æå®ããããã¡ã¤ã«ããªã«ãã¼ã§ããªãã¾ãã¯ç©ºã®ãã£ã¬ã¯ããªã§ã¯ãªãã¦ã ããããã¹ã¦ãåé¤ããã --keep ãã¡ã¤ã«ãåé¤ããªãã --safe ãã¡ã¤ã«ãå®å ¨ã«ãªã«ãã¼ã§ããã®ã§ããã°ãã¡ã¤ã«ãåé¤ãããã¨ã ãè¡ã(ããã©ã«ã)ã :説æ: ãã®ã³ãã³ãã«ãã£ã¦bzrã¯æå®ããããã¡ã¤ã«ã¸ã®å¤æ´ã®è¿½è·¡ãæ¢ãã¾ãã rebertã³ãã³ãã§å®¹æã«å¾©å ã§ããã®ã§ããã°bzrã¯ãããã®ãã¡ã¤ã«ãåé¤ãã¾ãã ãªãã·ã§ã³ãããã¯ãã©ã¡ã¼ã¿ãä¸ããããªããã°bzrã¯è¿½è·¡ããã¦ãããã¡ã¤ã«ãã¹ãã£ã³ãã¾ãã ããªã¼ã®ä¸ã§è¦ã¤ãããªããã°ãããã®è¿½è·¡ãåæ¢ãã¾ãã :ã¨ã¤ãªã¢ã¹: rm, del remove-tree =========== :ç®ç: ä¸ãããããã©ã³ã/ãã§ãã¯ã¢ã¦ãããä½æ¥ããªã¼ãé¤å¤ããã :使ãæ¹: bzr remove-tree [LOCATION] :ãªãã·ã§ã³: --force ã³ãããããã¦ããªãå¤æ´ããã£ã¦ãä½æ¥ããªã¼ãé¤å¤ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: 軽éãã§ãã¯ã¢ã¦ãã¯ä½æ¥ããªã¼ã¨å¤§å·®ãªãã®ã§ãããã¯ããã«å¯¾ããå®è¡ãæ絶ãã¾ãã ä½æ¥ããªã¼ãåç¾ããã«ã¯ã"bzr checkout"ã使ç¨ãã¾ãã :é¢é£é ç®: `checkout`_, `working-trees`_ renames ======= :ç®ç: ãªãã¼ã ããããã¡ã¤ã«ã®ä¸è¦§ã表示ããã :使ãæ¹: bzr renames [DIR] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :é¢é£é ç®: `status`_ resolve ======= :ç®ç: è¡çªã解æ¶ããããã®ã¨ãã¦ãã¼ã¯ããã :使ãæ¹: bzr resolve [FILE...] :ãªãã·ã§ã³: --all ãã®ããªã¼ã®ãã¹ã¦ã®è¡çªã解æ¶ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: 2ã¤ã®ãã©ã³ãã®éã®å¤æ´ãçµåããããã«ãã¼ã¸ã¯æåãå°½ããã¾ããã 人éã ããä¿®æ£ã§ãã種é¡ã®åé¡ãããã¾ãã ãã®åé¡ã«ééããã¨ããè¡çªããã¼ã¯ããã¾ãã è¡çªã¯ã³ãããããåã«ä½ããä¿®æ£ããå¿ è¦ããããã¨ãæå³ãã¾ãã ä¸æ¦åé¡ãä¿®æ£ããã°ãèªåçã«ããã¹ãã®è¡çªãä¿®æ£ãããã®ã¨ãã¦ãã¼ã¯ããããã«"bzr resolve"ã使ç¨ãã ç¹å®ã®è¡çªã解æ¶ãããã®ã¨ãã¦ãã¼ã¯ããããã«FILEãresolveãã¾ãã ãã¹ã¦ã®è¡çªã解æ¶ããããã®ã¨ãã¦ãã¼ã¯ããã«ã¯or "bzr resolve --all"ãè¡ãã¾ãã :é¢é£ã³ãã³ã: `bzr conflicts` :ã¨ã¤ãªã¢ã¹: resolved revert ====== :ç®ç: ãã¡ã¤ã«ã以åã®ãªãã¸ã§ã³ã«å·®ãæ»ãã :使ãæ¹: bzr revert [FILE...] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --forget-merges ãã¡ã¤ã«ãå¤æ´ããã«ãæªè§£æ±ºã®ãã¼ã¸ãã¼ã«ã¼ãåãé¤ãã --no-backup å·®ãæ»ãããããã¡ã¤ã«ã®ããã¯ã¢ãããä¿åããªãã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã :説æ: æå®ãããããã¹ãã ããå·®ãæ»ããã¡ã¤ã«ã®ãªã¹ãã渡ãã¾ãã ãããªããã°ããã¹ã¦ã®ãã¡ã¤ã«ãå·®ãæ»ããã¾ãã '--revision'ã§ãªãã¸ã§ã³ãæå®ãããªããã°ãæå¾ã«ã³ãããããããªãã¸ã§ã³ã使ç¨ããã¾ãã 以åã®ãªãã¸ã§ã³ã«å·®ãæ»ããã«ãããã¤ãã®å¤æ´ãé¤å¤ããã«ã¯ã代ããã«mergeã使ç¨ãã¾ãã ãã¨ãã°ã"merge . --revision -2..-3"ã¯-2ã§å°å ¥ãããå¤æ´ãé¤å¤ãã¾ããã -1ã§å°å ¥ãããå¤æ´ã«ã¯å½±é¿ãä¸ãã¾ããã hunk-by-hunkãã¼ã¹ã§ããå¤æ´ãé¤å¤ããã«ã¯ãShelfãã©ã°ã¤ã³ãåç §ãã¦ãã ããã ããã©ã«ãã§ã¯ãæåã§å¤æ´ããã¦ãããã¡ã¤ã«ã¯æåã«ããã¯ã¢ããããã¾ãã (ãã¼ã¸ã®ã¿ã§å¤æ´ããããã¡ã¤ã«ã¯ããã¯ã¢ããããã¾ããã) ããã¯ã¢ãããã¡ã¤ã«ã®ååã«ã¯ '.~#~' ã追å ããã¾ãã#ã¯çªå·ã§ãã ãã¡ã¤ã«ãæä¾ããå ´åãç¾å¨ã®ãã¹åãããã¯ã¿ã¼ã²ãããªãã¸ã§ã³ããã®ãã¹åã使ç¨ã§ãã¾ãã ååã§ãã¡ã¤ã«ã"undelete"ããããã«revertã使ç¨ã§ãã¾ãã ãã£ã¬ã¯ããªã«ååãã¤ããã¨ããã®ãã£ã¬ã¯ããªã®ãã¹ã¦ã®å 容ãå·®ãæ»ããã¾ãã ãã®ãªãã¸ã§ã³ä»¥éã«æ°ãã追å ããããã¡ã¤ã«ã¯åé¤ããã¾ããé©åã§ããã°ããã¯ã¢ããã¯ç¶æããã¾ãã æªç¥ã®ãã¡ã¤ã«ãæã¤ãã£ã¬ã¯ããªã¯åé¤ããã¾ããã ä½æ¥ããªã¼ã¯æªè§£æ±ºã®ãã¼ã¸ããããªãã¸ã§ã³ã®ãªã¹ããå«ã¿ã¾ãã ããã¯æ¬¡ã®ã³ãããã§è¦ªã¨ãã¦å«ã¾ãã¾ãã é常ã¯ããã¡ã¤ã«ãå·®ãæ»ãã®ã¨åæ§ã«revertã¯ãã®ãªã¹ããã¯ãªã¼ã³ã«ãã¾ãã ãã¡ã¤ã«ãæå®ããã¦ããã°ãrevertã¯æªè§£æ±ºã®ãã¼ã¸ãªã¹ãããã®ã¾ã¾ã«ãã¦ãã¡ã¤ã«ã ããå·®ãæ»ãã¾ãã ãã¹ã¦ã®ãã¡ã¤ã«ãå·®ãæ»ãããã¼ã¸ã®è¨é²ãç¶æããã«ã¯ããªã¼ã®rootã§"bzr revert ."ã使ç¨ãã ãã¡ã¤ã«ã®å·®ãæ»ããè¡ããã«æªè§£æ±ºã®ãã¼ã¸ãªã¹ããã¯ãªã¢ããã«ã¯"bzr revert --forget-merges"ã使ç¨ãã¾ãã :é¢é£é ç®: `cat`_, `export`_ revno ===== :ç®ç: ç¾å¨ã®ãªãã¸ã§ã³çªå·ã表示ããã :使ãæ¹: bzr revno [LOCATION] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ããã¯ãã®ãã©ã³ãã®ãªãã¸ã§ã³çªå·ã¨çããã§ãã :é¢é£é ç®: `info`_ root ==== :ç®ç: ããªã¼ã®rootãã£ã¬ã¯ããªã表示ããã :使ãæ¹: bzr root [FILENAME] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: The rootã¯.bzrã³ã³ããã¼ã«ãã£ã¬ã¯ããªãæã¤ãã£ã¨ãè¿ãåå°ãã£ã¬ã¯ããªã§ãã send ==== :ç®ç: å¤æ´ãæ稿ããããã«ã¡ã¼ã«ãéããããã¯mergeãã£ã¬ã¯ãã£ããä½æããã :使ãæ¹: bzr send [SUBMIT_BRANCH] [PUBLIC_BRANCH] :ãªãã·ã§ã³: -f ARG, --from=ARG ä½æ¥ãã£ã¬ã¯ããªãå«ããã©ã³ãããããæ稿ãã©ã¼ã ãçæãããã©ã³ãã --remember æ稿ã¨å ¬éãã©ã³ããè¦ããã --mail-to=ARG ãã®ã¢ãã¬ã¹ã«ãªã¯ã¨ã¹ãã¡ã¼ã«ãéä¿¡ããã --format=ARG æå®ããããã©ã¼ãããã使ç¨ããã "0.9": ãã³ãã«ãã©ã¼ããã 0.9ããã¼ã¸ãã£ã¬ã¯ãã£ã 1ã "4": ãã³ãã«ãã©ã¼ããã 4ããã¼ã¸ãã£ã¬ã¯ãã£ã 2 (ããã©ã«ã)ã --no-bundle ãã³ãã«ãmergeãã£ã¬ã¯ãã£ãã«å«ããªãã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -o ARG, --output=ARG mergeãã£ã¬ã¯ãã£ãããã®ãã¡ã¤ã«ã«æ¸ãè¾¼ã; stdoutç¨ã«-ã使ç¨ããã -m ARG, --message=ARG ã¡ãã»ã¼ã¸ã®æååã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã --no-patch mergeãã£ã¬ã¯ãã£ãã«ãã¬ãã¥ã¼ããããå«ããªãã -v, --verbose 詳細ãªæ å ±ã表示ããã :説æ: mergeãã£ã¬ã¯ãã£ãã¯mergeãªã¯ã¨ã¹ããè¡ãããã«å¿ è¦ãªå¤ãã®ãã®ãæä¾ãã¾ã: * å®è¡ãããã¼ã¸ã®ãã·ã³ãç解ã§ãã説æ * ãªã¯ã¨ã¹ããããå¤æ´ã®ãã¬ãã¥ã¼ã§ãããªãã·ã§ã³ã®ããã * ãªãã¸ã§ã³ãã¼ã¿ã®ãªãã·ã§ã³ãã³ãã«ã ãã©ã³ããããã¼ã¿ãèªã¿è¾¼ã¾ãã«ãmergeãã£ã¬ã¯ããªããã®å¤æ´ãç´æ¥é©ç¨ã§ããããã«ãªãã¾ãã --no-bundleãæå®ãããã¨ãpublic_branchãå¿ è¦ã§ã(ã¾ãææ°ã§ãªããã°ãªãã¾ãã)ã åãåãæãpublic_branchã使ç¨ãããã¼ã¸ãå®è¡ã§ããããã« å¾ã§ä»ã®äººããã§ãã¯ã§ããããã«ãç¥ã£ã¦ããã®ã§ããã°public_branchã常ã«å«ã¾ãã¦ããªããã°ãªãã¾ããã æ稿ãã©ã³ãã®ããã©ã«ãã¯è¦ªã§ãããä¸æ¸ãã§ãã¾ãã æä¾ãããã°æ稿ãã©ã³ãã¨å ¬éãã©ã³ãã®ä¸¡æ¹ãè¨é²ããã¾ãã public_branchãsubmit_branchã«ç¥ããã¦ããã°ã ãã®å ¬éã¨æ稿ãã©ã³ãã¯ãã¼ã¸ã®ã¤ã³ã¹ãã©ã¯ã·ã§ã³ã§ä½¿ç¨ããã¾ãã ããã¯ãã®ãã¼ã«ã«ãã©ã¼ã«å¯¾ãã¦public_branchãè¨å®ããã°ã ãã®ãã©ã¼ã¯å®éã®æ稿ãã©ã³ãã¨ãã¦ä½¿ç¨ã§ãããã¨ãæå³ãã¾ãã ã¡ã¼ã«ã¯å¥½ããªããã°ã©ã ã§éä¿¡ããã¾ãã Windowsã§ã¯ããã¯ééçã§ã(MAPIã使ç¨ããã)ã Linuxã§ã¯ãxdg-emailã¦ã¼ãã£ãªãã£ãå¿ è¦ã¨ãã¾ãã æã¾ããã¯ã©ã¤ã¢ã³ããè¦ã¤ãããªããã°(ãããã¯ä½¿ç¨ã§ããªããã°)ãã¨ãã£ã¿ã使ç¨ããã¾ãã ç¹å®ã®ã¡ã¼ã«ããã°ã©ã ã使ç¨ããã«ã¯ãmail_clientè¨å®ãªãã·ã§ã³ãè¨å®ãã¾ãã (Thunderbird 1.5ã«é¢ãã¦ãããã¯ããã¤ãã®ãã°ã«å¯¾å¦ãã¾ãã) ç¹å®ã®ã¯ã©ã¤ã¢ã³ãç¨ã«ãµãã¼ããããå¤ã¯"claws"ã"evolution"ã"kmail"ã"mutt"ãã¨"thunderbird"; ä¸è¬çãªãªãã·ã§ã³ã¯"default"ã"editor"ã"emacsclient"ã"mapi"ãã¨"xdg-email"ã§ãã ãã©ã°ã¤ã³ããµãã¼ããããã¯ã©ã¤ã¢ã³ãã追å ãããã¨ãããã¾ãã ã¡ã¼ã«ãéä¿¡ããã¦ããå ´åãto addressãå¿ è¦ã«ãªãã¾ãã ããã¯ã³ãã³ãã©ã¤ã³ãsubmit_toè¨å®ãªãã·ã§ã³ããã©ã³ãèªèº«ã«è¨å®ãããã æ稿ãã©ã³ãã§child_submit_toè¨å®ãªãã·ã§ã³ãè¨å®ãããã¨ã§æä¾ã§ãã¾ãã ç¾å¨2ã¤ã®ãã©ã¼ãããããµãã¼ãããã¦ãã¾ã: "4"ã¯ãªãã¸ã§ã³ãã³ãã«ãã©ã¼ããã4 ã¨ãã¼ã¸ãã£ã¬ã¯ããªãã©ã¼ããã2ã§ãã ããã¯å¤ããã©ã¼ããããããé¡èã«éãå°ããã§ãã ããã¯Bazaar 0.19ã¨ãã以éã§äºææ§ãããã¾ãã ããã¯ããã©ã«ãã§ãã "0.9"ã¯ãªãã¸ã§ã³ãã³ãã«ãã©ã¼ããã0.9ã¨ãã¼ã¸ãã£ã¬ã¯ãã£ããã©ã¼ããã1ã使ç¨ãã¾ãã ããã¯0.12 - 0.18ã¨äºææ§ãããã¾ãã mergeãããã¯pullã³ãã³ãã使ç¨ãããã¨ã§mergeãã£ã¬ã¯ããªãé©ç¨ããã¾ãã :é¢é£é ç®: `merge`_, `pull`_ serve ===== :ç®ç: bzrãµã¼ãã¼ã稼åãããã :使ãæ¹: bzr serve :ãªãã·ã§ã³: --allow-writes ããã©ã«ãã§ã¯ãµã¼ãã¼ã¯ãªã¼ããªã³ãªã¼ã®ãµã¼ãã¼ã§ãã --allow-writesãæä¾ããã¨æä¾ããããã£ã¬ã¯ããªã¨ ãã®ä¸ã®å 容ã¸ã®æ¸ãè¾¼ã¿æ¨©éãæå¹ã«ã§ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --directory=ARG ãã®ãã£ã¬ã¯ããªã®å 容ããµã¼ãããã --port=ARG [hostname:]portnumberå½¢å¼ã§æåããããã¼ãä¸ã§æ¥ç¶ããããã«ãªã¹ã³ããã 0ããã¼ãçªå·ã¨ãã¦å²ãå½ã¦ãã¨ãã¼ãã¯åçãªå²ãå½ã¦ã«ãªãã¾ãã ããã©ã«ãã®ãã¼ãã¯4155ã§ãã --inet inetdãããã¯sshdããã®ä½¿ç¨ã®ããã«stdin/outã§serveããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :ã¨ã¤ãªã¢ã¹: server shelve ====== :ç®ç: ããã¤ãã®å¤æ´ãç¾å¨ã®ããªã¼ããä¸æçã«éé¿ããã :使ãæ¹: bzr shelve [FILE...] :ãªãã·ã§ã³: --all ãã¹ã¦ã®å¤æ´ãéé¿ããã -v, --verbose 詳細ãªæ å ±ã表示ããã --list éé¿ãããå¤æ´ã®ä¸è¦§ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -m ARG, --message=ARG ã¡ãã»ã¼ã¸ã®æååã -r ARG, --revision=ARG 詳細ã«é¢ãã¦ã¯"help revisionspec"ãåç §ã writer: --plain ãã¬ã¼ã³ããã¹ãå½¢å¼ã§ã®å·®åã®åºåã :説æ: shelveã«ãã£ã¦å¤æ´ãä¸æçã«"æ£ã«ä¸ãã"ãããªãã¡éªéã«ãªããªãå ´æã«ç½®ããã¨ãã§ãã¾ãã 'unshelve'ã³ãã³ãã§å¾ã§å ã«æ»ããã¨ãã§ãã¾ãã shelve --listãæå®ãããã¨ã以åéé¿ãããå¤æ´ã®ä¸è¦§ã表示ããã¾ãã shelveã¯ä¸é©åã«æ··ããããå¤æ´ã®ããã¤ãã®ã»ããã®åé¢ãæå©ããããã¨ãç®çã¨ãã¦ãã¾ãã ãã¹ã¦ã®å¤æ´ãé¤å»ãããã ãã§å¾ã§éé¿ããå¿ è¦ããªããã°ãrevertã使ç¨ãã¾ãã ä¸åº¦ã«ãã¹ã¦ã®ããã¹ãã®å¤æ´ãshelveããã«ã¯ãshelve --allã使ç¨ãã¾ãã ãã¡ã¤ã«åãæå®ãããã¨ããããã®ãã¡ã¤ã«ã®å¤æ´ã®ã¿éé¿ããã¾ãã ä»ã®ãã¡ã¤ã«ã¯æã¤ããã®ã¾ã¾ã§ãã ãªãã¸ã§ã³ãæå®ãããã°ããã®ãªãã¸ã§ã³ä»¥éã®å¤æ´ã¯éé¿ããã¾ãã è¤æ°ã®ã¢ã¤ãã ãéé¿ãããã¨ãã§ããããã©ã«ãã§ã¯ã 'unshelve'ã¯æè¿shelveãããå¤æ´ã復å ãã¾ãã :é¢é£é ç®: `unshelve`_ sign-my-commits =============== :ç®ç: ä¸ããããã³ããã¿ã¼ã§ãã¹ã¦ã®ã³ãããã«ç½²åããã :使ãæ¹: bzr sign-my-commits [LOCATION] [COMMITTER] :ãªãã·ã§ã³: --dry-run å®éã«ç½²åããªãã ç½²åããããªãã¸ã§ã³ã表示ããã ãã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ä½ç½®ãæå®ãããªããã°ãã¼ã«ã«ããªã¼ã使ç¨ããã¾ãã ã³ããã¿ã¼ãæå®ãããªããã°ããã©ã«ãã®ã³ããã¿ã¼ã使ç¨ããã¾ãã ããã¯ãã§ã«ã·ã°ããã£ãæã¤ã³ãããã«ã¯ç½²åãã¾ããã split ===== :ç®ç: ããªã¼ã®ãµããã£ã¬ã¯ããªãåå¥ã®ããªã¼ã«åå²ããã :使ãæ¹: bzr split TREE :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãã®ã³ãã³ãã¯'rich-root' ããã㯠'rich-root-pack'ã®ããã« ãªããrootããµãã¼ããããã©ã¼ãããã§ã¿ã¼ã²ããããªã¼ãçã¿åºãã¾ãã ãããã®ãã©ã¼ãããã¯'dirstate-tags'ã®ãããªåæã®ãã©ã¼ãããã«å¤æã§ãã¾ããã TREEã®å¼æ°ã¯ä½æ¥ããªã¼ã®ãµããã£ã¬ã¯ããªã«ãªãã¾ãã ãã®ãµããã£ã¬ã¯ããªã¯ç¬èªã®ãã©ã³ããæã¤ç¬ç«ããããªã¼ã«å¤æããã¾ãã ãããã¬ãã«ããªã¼ã®ã³ãããã¯æ°ãããµãããªã¼ã«é©ç¨ããã¾ããã status ====== :ç®ç: ã¹ãã¼ã¿ã¹ã®è¦ç´ã表示ããã :使ãæ¹: bzr status [FILE...] :ãªãã·ã§ã³: -S, --short çãã¹ãã¼ã¿ã¹ã¤ã³ã¸ã±ã¼ã¿ã¼ã表示ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -V, --versioned ãã¼ã¸ã§ã³ç®¡çããããã¡ã¤ã«ã ãã表示ããã --no-pending æªè§£æ±ºã®ãã¼ã¸ã表示ããªãã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --show-ids å é¨ãªãã¸ã§ã¯ãidã表示ããã -c ARG, --change=ARG æå®ããããªãã¸ã§ã³ã§å°å ¥ãããå¤æ´ãé¸æããã "help revisionspec"ãåç §ã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã :説æ: ããã¯ãã¼ã¸ã§ã³ç®¡çããããã¡ã¤ã«ã¨æªç¥ã®ãã¡ã¤ã«ãç¶æ 㧠åé¡ãã¦ã¬ãã¼ããã¾ããå©ç¨å¯è½ãªç¶æ ã¯æ¬¡ã®ã¨ããã§ã: added ä½æ¥ããªã¼ã§ãã¼ã¸ã§ã³ç®¡çããã¦ããã以åã®ãªãã¸ã§ã³ã§ã¯ãªãã removed 以åã®ãªãã¸ã§ã³ã§ãã¼ã¸ã§ã³ç®¡çããã¦ãããä½æ¥ã³ãã¼ã§ã¯ç§»åãããã¯åé¤ããã¦ããã renamed 以åã®ãªãã¸ã§ã³ããå¤æ´ããããã¡ã¤ã«ã®ãã¹; ããã¹ããå¤æ´ããã¦ãããã¨ãããã ããã¯è¦ªãã£ã¬ã¯ããªããªãã¼ã ããããã¡ã¤ã«ãå«ãã modified 以åã®ãªãã¸ã§ã³ä»¥éå¤æ´ãããããã¹ãã kind changed å¤æ´ããããã¡ã¤ã«ã®ç¨®é¡(ãã¨ãã°ãã¡ã¤ã«ãããã£ã¬ã¯ããªã¸)ã unknown ãã¼ã¸ã§ã³ç®¡çããã¦ããªããã¤ç¡è¦ãã¿ã¼ã³ã«ãããããªãã ç¡è¦ããããã¡ã¤ã«ãè¦ãã«ã¯'bzr ignored'ã使ç¨ãã¾ãã ãã¡ã¤ã«ããã¹ãã¸ã®è©³ç´°ãªå¤æ´ã«é¢ãã¦ã¯ã'bzr diff'ã使ç¨ãã¾ãã --shortãããã¯-Sã¯ãSubversionã®statusã³ãã³ãã«ä¼¼ãã ããããã®ã¢ã¤ãã ã«å¯¾ããã¹ãã¼ã¿ã¹ãã©ã°ãæä¾ãããã¨ã«æ³¨æãã¦ãã ããã svn -qã¨ä¼¼ããããªåºåãå¾ãã«ã¯ãbzr status -SVã使ç¨ãã¾ãã å¼æ°ãæå®ãããªããã°ãä½æ¥ãã£ã¬ã¯ããªå ¨ä½ã®ã¹ãã¼ã¿ã¹ã示ããã¾ãã ãããªããã°ãæå®ããããã¡ã¤ã«ãããã¯ãã£ã¬ã¯ããªã®ã¹ãã¼ã¿ã¹ã®ã¿ãå ±åããã¾ãã ãã£ã¬ã¯ããªã渡ãããã°ããã®ãã£ã¬ã¯ããªå é¨ã®ãã¹ã¦ã«é¢ããã¹ãã¼ã¿ã¹ãå ±åããã¾ãã 1ã¤ã®ãªãã¸ã§ã³ã®å¼æ°ã渡ãããã°ãã¹ãã¼ã¿ã¹ã¯ãã®ãªãã¸ã§ã³ã«å¯¾ã㦠2ã¤ã®å¼æ°ã®å ´åã¯2ã¤ã®ãªãã¸ã§ã³ã®éã§ç®åºããã¾ãã :ã¨ã¤ãªã¢ã¹: st, stat :é¢é£é ç®: `diff`_, `revert`_, `status-flags`_ switch ====== :ç®ç: ãã§ãã¯ã¢ã¦ãã®ãã©ã³ããè¨å®ãã¦updateããã :使ãæ¹: bzr switch TO_LOCATION :ãªãã·ã§ã³: --force ãã¼ã«ã«ã³ãããã失ããã¦ãã¦ãåãæ¿ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: 軽éãã§ãã¯ã¢ã¦ãã«å¯¾ãã¦ãããã¯åç §ããã¦ãããã©ã³ããå¤æ´ãã¾ãã ééãã§ãã¯ã¢ã¦ãã«å¯¾ãã¦ãããã¯ãã¼ã«ã«ã³ãããããªãã ãã¤ã³ãããããã©ã³ãããªããã¨ã確èªãã¦ã ãã¼ã«ã«ãã©ã³ããæ°ãããã±ã¼ã·ã§ã³ã®ãã©ã¼ã«ãã¦ããã«ãã¤ã³ããã¾ãã 両æ¹ã®å ´åã«ããã¦ãä½æ¥ããªã¼ã¯updateããã³ãããããã¦ãªãå¤æ´ã¯ãã¼ã¸ããã¾ãã ã¦ã¼ã¶ã¼ã¯æãã®ã§ããã°commitãããã¯revertã§ãã¾ãã ãã¼ã¸ã®è¿½å ã«ã¯swithã使ç¨ããåã«commitãããã¯revertããå¿ è¦ãããã¾ãã swithãããã©ã³ãã¸ã®ãã¹ã¯ç¾å¨ã®ãã©ã³ãã®è¦ªãã£ã¬ã¯ããªã«å¯¾ãã¦ç¸å¯¾çã«æå®ã§ãã¾ãã ãã¨ãã°ãç¾å¨/path/to/branchã®ãã§ãã¯ã¢ã¦ãã®ä¸ã«ããã®ã§ããã° 'newbranch'ãæå®ããã°/path/to/newbranchã§ã®ãã©ã³ããçºè¦ããã¾ãã ãã¼ã«ã«ã«è¨å®ããã¦ããªãéããã¤ã³ãããããã©ã³ãã¯ãã¹ã¿ã¼ãã©ã³ãã®ããã¯ãã¼ã ã使ç¨ãã¾ãã ãã®å ´åãswitchãè¡ãã¨ãã¼ã«ã«ã®ããã¯ãã¼ã ã¯ãã¹ã¿ã¼ã®ãã®ã«æ´æ°ããã¾ãã tag === :ç®ç: ãªãã¸ã§ã³ãåã¥ãã£ãã¿ã°ãä½æãåé¤ãããã¯ä¿®æ£ããã :使ãæ¹: bzr tag TAG_NAME :ãªãã·ã§ã³: --force æ¢åã®ã¿ã°ãç½®ãæããã -v, --verbose 詳細ãªæ å ±ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -d ARG, --directory=ARG ã¿ã°ãè¨ç½®ãããã©ã³ã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã --delete ç½®ãæãããããã¿ã°ãåé¤ããã :説æ: ã¿ã°ã¯ãªãã¸ã§ã³ã«äººéãç解ã§ããååãä¸ãã¾ãã -r (--revision)ãªãã·ã§ã³ãã¨ãã³ãã³ãã¯-rtag:Xã«æ¸¡ããã¾ãã Xã¯ä»¥åä½æãããã¿ã°ã§ãã ã¿ã°ã¯ãã©ã³ãã«ä¿åããã¾ãã branchãpushãpullãããã¯mergeãè¡ãã¨ãã¿ã°ã¯ãããã©ã³ãããä»ã®ãã©ã³ãã«ã³ãã¼ããã¾ãã --forceã渡ããªãéããæ¢åã®ã¿ã°åãä¸ããã¨ã¨ã©ã¼ã«ãªãã¾ãã ãã®å ´åæ°ãããªãã¸ã§ã³ã示ãããã«ã¿ã°ã¯ç§»åãã¾ãã ã¿ã°ããªãã¼ã ãã(ååãå¤æ´ãããåããªãã¸ã§ã³ã§ç¶æãã)ã«ã¯ã ``bzr tag new-name -r tag:old-name`` 㨠``bzr tag --delete oldname`` ãå®è¡ãã¾ãã :é¢é£é ç®: `commit`_, `tags`_ tags ==== :ç®ç: ã¿ã°ã®ä¸è¦§ã表示ããã :使ãæ¹: bzr tags :ãªãã·ã§ã³: --sort=ARG ç°ãªãåºæºã§ã¿ã°ãã½ã¼ãããã "alpha": è¾æ¸å¼ã§ã¿ã°ãã½ã¼ããã(ããã©ã«ã)ã "time": 年代é ã§ã¿ã°ãã½ã¼ãããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -d ARG, --directory=ARG ã¿ã°ã表示ããããã©ã³ãã --show-ids å é¨ãªãã¸ã§ã¯ãidã表示ããã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãã®ã³ãã³ãã¯ããããåç §ããã¿ã°åã¨ãªãã¸ã§ã³ã®ãã¼ãã«ã表示ãã¾ãã :é¢é£é ç®: `tag`_ testament ========= :ç®ç: ãªãã¸ã§ã³ã®testament(ç½²åã®ãã©ã¼ã )ã表示ããã :使ãæ¹: bzr testament [BRANCH] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --long é·ããã©ã¼ãããã®testamentãçæããã --strict å³å¯ãªãã©ã¼ãããã®testamentãçæããã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã unbind ====== :ç®ç: ç¾å¨ã®ãã§ãã¯ã¢ã¦ããé常ã®ãã©ã³ãã«å¤æããã :使ãæ¹: bzr unbind :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: unbindããå¾ã§ããã¼ã«ã«ãã©ã³ãã¯ç¬ç«ãããã®ã¨ãã¦è¦ãªãã ãã®å¾ã®ã³ãããã¯ãã¼ã«ã«ã®ã¿ã§è¡ããã¾ãã :é¢é£é ç®: `bind`_, `ãã§ãã¯ã¢ã¦ã`_ uncommit ======== :ç®ç: æå¾ã«ã³ãããããããªãã¸ã§ã³ãåé¤ããã :使ãæ¹: bzr uncommit [LOCATION] :ãªãã·ã§ã³: --dry-run å®éã«ã¯å¤æ´ããªãã -v, --verbose 詳細ãªæ å ±ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --force ãã¹ã¦ã®è³ªåã«yesã¨çããã --local ãã§ãã¯ã¢ã¦ãã®ã¨ããã¼ã«ã«ãã©ã³ãããã³ãããã®ã¿ãåé¤ããã -r ARG, --revision=ARG 詳細ã¯"help revisionspec"ãåç §ã :説æ: --verboseã¯åé¤ããã¦ãããã®ã表示ãã¾ãã --dry-runã¯ãã¹ã¦ã®ã¢ã¼ã·ã§ã³ãçµé¨ãã¾ãããå®éã«ã¯ä½ãåé¤ãã¾ããã --revisionãæå®ãããã¨ãæå®ããããªãã¸ã§ã³ã§ãã©ã³ãããã®ã¾ã¾ã«ããããã« ãªãã¸ã§ã³ãuncommitãã¾ãããã¨ãã°ã"bzr uncommit -r 15"ã¯ãªãã¸ã§ã³15ã§ã®ãã©ã³ãã ãã®ã¾ã¾ã«ãã¾ãã uncommitã¯æ°ããã³ãããã®æºåãã§ãã¦ããä½æ¥ããªã¼ããã®ã¾ã¾ã«ãã¾ãã å¯ä¸è¡ãããå¤æ´ã¯ã³ããã以åã«åå¨ãã¦ãã追å ãã¼ã¸ããªã¹ãã¢ãããã¨ã§ãã :é¢é£é ç®: `commit`_ unshelve ======== :ç®ç: shelveãããå¤æ´ã復å ããã :使ãæ¹Usage: bzr unshelve [SHELF_ID] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã ã¢ã¯ã·ã§ã³: --apply å¤æ´ãé©ç¨ãã¦shelfããåé¤ããã --delete-only å¤æ´ãé©ç¨ããã«ããããåé¤ããã --dry-run ç·¨åã表示ãããããããé©ç¨ãããã¯é¤å¤ããªãã :説æ: ããã©ã«ãã§ã¯ãæè¿shelveãããå¤æ´ã復å ããã¾ãã ãã¾ã§ããããæå®ããã¨ãã¦ããããã®å¤æ´ã代ããã«å¾©å ããã¾ãã å¤æ´ããäºãã«ä¾åããªãã¨ãã«ããã¯ãã£ã¨ãè¯ãæ©è½ãã¾ãã :é¢é£é ç®: `shelve`_ update ====== :ç®ç: ãã©ã³ãã«ã³ãããããææ°ã³ã¼ãã«ããªã¼ãæ´æ°ããã :使ãæ¹: bzr update [DIR] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :説æ: ãã®ã³ãã³ãã¯ä½æ¥ããªã¼ã§ãã¼ã¸ãå®è¡ããè¡çªãçæãããã¨ãããã¾ãã ãã¼ã«ã«ã®å¤æ´ãããå ´åãupdateãå®äºãããããã« updateã®å¾ã§ããããã³ãããããå¿ è¦ãããã¾ãã ãã¼ã«ã«ã®å¤æ´ãç ´æ£ãããå ´åãupdateã®å¾ã§'bzr commit'ã®ä»£ããã« 'bzr revert'ã使ç¨ã§ãã¾ãã :ã¨ã¤ãªã¢ã¹: up :é¢é£é ç®: `pull`_, `status-flags`_, `working-trees`_ upgrade ======= :ç®ç: ãã©ã³ãã®ã¹ãã¬ã¼ã¸ãç¾å¨ã®ãã©ã¼ãããã«ã¢ããã°ã¬ã¼ãããã :使ãæ¹: bzr upgrade [URL] :ãªãã·ã§ã³: -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã ãã©ã³ãã®ãã©ã¼ããã:: --format=ARG ãã®ãã©ã³ãã®ãã©ã¼ããããæå®ããã"help formats"ãåç §ã --1.12-preview ãã¥ã¼ã¨ã³ã³ãã³ãã®ãã£ã«ã¿ãªã³ã°ããµãã¼ãããä½æ¥ããªã¼ãã©ã¼ãããã --1.12-preview-rich-root rich-rootãã¼ã¿ããµãã¼ããã1.12-previewã®ããªã¢ã³ã(bzr-svnã«å¿ è¦) --1.6 ã¹ã¿ãã¯ããµãã¼ããããªãã¸ããªã«åºã¥ãããã©ã³ãã¨ããã¯ã --1.6.1-rich-root ã¹ã¿ãã¯ã¨ãªãããªrootãã¼ã¿ããµãã¼ããããªãã¸ããªã«åºã¥ãã ãã©ã³ãã¨ããã¯(bzr-svnã«å¿ è¦)ã --1.9 btreeã¤ã³ããã¯ã¹ã使ç¨ãããªãã¸ããªã«åºã¥ãããã©ã³ãã¨ãã㯠--1.9-rich-root btreeã¤ã³ããã¯ã¹ã¨ãªããrootãã¼ã¿ã使ç¨ãã ãªãã¸ããªã«åºã¥ãããã©ã³ãã¨ããã¯(bzr-svnã«å¿ è¦)ã --default 0.92ã®æ°ããæ©è½: dirstate-tagsãã©ã¼ããããªãã¸ããªã¨ äºææ§ã®ãããã¼ã¿ãæã¤ããã¯ãã¼ã¹ã®ãã©ã¼ãããã 0.92以åã®bzrãªãã¸ããªã¨ç¸äºéç¨ãã¾ãã bzr < 0.92ã§ã¯èªããã¨ãã§ãã¾ããã 以åã¯knitpack-experimentalã¨å¼ã°ãã¦ãã¾ããã 詳細ãªæ å ±ã¯ http://doc.bazaar-vcs.org/latest/developers/packrepo.html ãåç §ã --development ç¾å¨ã®éçºãã©ã¼ãããããã¼ã¿ãpack-0.92 (ã¨pack-0.92ã¨äºææ§ã®ãã) ãã©ã¼ããããªãã¸ããªã«å¤æã§ããã ãã®ãã©ã¼ãããã®ãªãã¸ããªã¨ãã©ã³ãã¯bzr.devã«ãã£ã¦ã®ã¿èªã¿è¾¼ã¿ã§ãã¾ãã 使ç¨ããåã« http://doc.bazaar-vcs.org/latest/developers/development-repo.html ãåç §ãã¦é ããããé¡ããã¾ãã --development-subtree ç¾å¨ã®éçºãã©ã¼ãããã§ãsubtreeããªã¢ã³ãã ãã¼ã¿ãpack-0.92-subtree(ã¨pack-0.92-subtreeã¨äºææ§ã®ãã) ãã©ã¼ããããªãã¸ããªã«å¤æã§ããã ãã®ãã©ã¼ãããã®ãªãã¸ããªã¨ãã©ã³ãã¯bzr.devã§ã®ã¿èªã¿è¾¼ã¿ã§ããã 使ç¨ããåã« http://doc.bazaar-vcs.org/latest/developers/development- repo.html ãã覧ããã ããããé¡ããã¾ãã --dirstate 0.15ã®æ°ãããã©ã¼ããã: éããã¼ã«ã«ãªãã¬ã¼ã·ã§ã³ã ãããã¯ã¼ã¯ãéããã¢ã¯ã»ã¹ã®ã¨ãbzr 0.8ã¨ãã以éã¨äºææ§ãããã --dirstate-tags 0.15ã®æ°ãããã©ã¼ããã: éããã¼ã«ã«ãªãã¬ã¼ã·ã§ã³ã§ ãããã¯ã¼ã¯ãªãã¬ã¼ã·ã§ã³ã«é¢ããã¹ã±ã¼ãªã³ã°ãæ¹åã ã¿ã°ã®ãµãã¼ãã追å ãbzr < 0.15ã¨ã¯äºææ§ããªãã --knit knitsã使ç¨ãããã©ã¼ããããbzr <= 0.14ã¨ã®ç¸äºéç¨ã«æ¨å¥¨ã --metaweave 0.8ã§ã®æ«å®ãã©ã¼ããããknitãããé ãã --pack-0.92 0.92ã®æ°ãããã©ã¼ããã: dirstate-tagsãã©ã¼ããããªãã¸ããªã¨ äºææ§ã®ãããã¼ã¿ãæã¤ããã¯ãã¼ã¹ã®ãã©ã¼ãããã 0.92以åã®bzrãªãã¸ããªã¨ç¸äºéç¨ã§ãããbzr < 0.92.ã«ãã£ã¦èªã¿è¾¼ã¿ã§ããªãã 以åã¯knitpack-experimentalã¨å¼ã°ãã¦ããã 詳細ãªæ å ±ã«é¢ãã¦ã¯ã http://doc .bazaar-vcs.org/latest/developers/packrepo.html ãåç §ã --rich-root 1.0ã®æ°ãããã©ã¼ããããããªã¼rootã®ãã¿ã¼ãªæ±ãã bzr < 1.0ã¨äºææ§ããªãã --rich-root-pack 1.0ã®æ°ãããã©ã¼ããã: rich-rootãã¼ã¿ããµãã¼ããã pack-0.92ã®ããªã¢ã³ã(bzr-svnã«å¿ è¦)ã --weave 0.8以åã®ãã©ã¼ããããknitãããé ã ãã§ãã¯ã¢ã¦ããããã¯å ±ç¨ãªãã¸ããªããµãã¼ãããªãã :説æ: ã¨ãã©ããã®ã³ãã³ããå®è¡ããã«checkã³ãã³ããããã¯bzrã®éçºè ãã¢ããã¤ã¹ãããã¨ãããã¾ãã ããã©ã«ããã©ã¼ããããå¤æ´ãããã¨ãã¢ããã°ã¬ã¼ãããä»ã®ãªãã¬ã¼ã·ã§ã³ã®å®è¡ä¸ã«è¦åããããã¨ãããã¾ãã :é¢é£ã³ãã³ã: `check`_ version ======= :ç®ç: bzrã®ãã¼ã¸ã§ã³ã表示ãã :使ãæ¹: bzr version :ãªãã·ã§ã³: --short ãã¼ã¸ã§ã³çªå·ã ãã表示ããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã ã表示ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã version-info ============ :ç®ç: ãã®ããªã¼ã«é¢ãããã¼ã¸ã§ã³æ å ±ã表示ããã :使ãæ¹: bzr version-info [LOCATION] :ãªãã·ã§ã³: --all ãã¹ã¦ã®å ¥æå¯è½ãªæ å ±ãå«ããã -v, --verbose 詳細ãªæ å ±ã表示ããã --check-clean ããªã¼ãã¯ãªã¼ã³ã§ããããã§ãã¯ããã --include-history ãªãã¸ã§ã³ã®å±¥æ´ãå«ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --template=ARG åºåç¨ã®ãã³ãã¬ã¼ãã --include-file-revisions ããããã®ãã¡ã¤ã«ã«å¯¾ããæçµãªãã¸ã§ã³ãå«ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã ãã©ã¼ããã:: --format=ARG åºåãã©ã¼ããããé¸æããã --custom ã«ã¹ã¿ã ãã³ãã¬ã¼ããã¼ã¹ã®ãã©ã¼ãããã§ã®ãã¼ã¸ã§ã³æ å ±ã --python Pythonãã©ã¼ãããã§ã®ãã¼ã¸ã§ã³æ å ±ã --rio RIOãã©ã¼ããã(ã·ã³ãã«ãªããã¹ã)ã§ã®ãã¼ã¸ã§ã³æ å ±(ããã©ã«ã)ã :説æ: ãã¼ã¸ã§ã³ã«é¢ããæ å ±ãã¢ããªã±ã¼ã·ã§ã³ã®ã½ã¼ã¹ã³ã¼ãã«è¿½å ããããã« ãã®ã³ãã³ãã使ç¨ã§ãã¾ããåºåã®ãã©ã¼ãããã¯ãµãã¼ãããã¦ãããã®1ã¤ã ãã³ãã¬ã¼ãã«åºã¥ãã¦ã«ã¹ã¿ãã¤ãºããããã®ã§ãã ä¾:: bzr version-info --custom \ --template="#define VERSION_INFO \"Project 1.2.3 (r{revno})\"\n" ç¾å¨ã®ãªãã¸ã§ã³çªå·ãå«ããã©ã¼ããããããæååã§Cããããã¡ã¤ã«ãçæãã¾ãã ãã³ãã¬ã¼ãã§ã®ãµãã¼ããããä»ã®å¤æ°ã¯æ¬¡ã®ã¨ããã§ã: * {date} - æçµãªãã¸ã§ã³ã®æ¥ä» * {build_date} - ç¾å¨ã®æ¥ä» * {revno} - ãªãã¸ã§ã³çªå· * {revision_id} - ãªãã¸ã§ã³id * {branch_nick} - ãã©ã³ãã®ããã¯ãã¼ã * {clean} - ã½ã¼ã¹ã³ã¼ããã³ãããããã¦ããªãå¤æ´ãå«ãã¨ãã¯0ã§ãã以å¤ã¯1 whoami ====== :ç®ç: bzrã®ã¦ã¼ã¶ã¼idã表示ãããã¯è¨å®ããã :使ãæ¹: bzr whoami [NAME] :ãªãã·ã§ã³: --email Eã¡ã¼ã«ã¢ãã¬ã¹ã®ã¿è¡¨ç¤ºããã -v, --verbose 詳細ãªæ å ±ã表示ããã -q, --quiet ã¨ã©ã¼ã¨è¦åã®ã¿ã表示ããã --branch ã°ãã¼ãã«ã®ä»£ããã«ç¾å¨ã®ãã©ã³ãç¨ã®IDãè¨å®ããã -h, --help ãã«ãã¡ãã»ã¼ã¸ã表示ããã :ä¾: ç¾å¨ã®ã¦ã¼ã¶ã¼ã®Eã¡ã¼ã«ã表示ãã:: bzr whoami --email ç¾å¨ã®ã¦ã¼ã¶ã¼ãè¨å®ãã:: bzr whoami "Frank Chu <fchu@example.com>"