.. _organizing-your-workspace: ä½æ¥ã¹ãã¼ã¹ãæ§æãã ========================= .. _common-workspace-layouts: ä¸è¬çãªã¬ã¤ã¢ã¦ã --------------------- Bazaarã®ã¦ã¼ã¶ã¼ãããã¸ã§ã¯ãã®ããã®ä½æ¥ã¹ãã¼ã¹ãæ§æãããã¹ããªæ¹æ³ã¯ã\ 次ã®ãããªè¦ç´ ã«ä¾åãã¾ã: * ã¦ã¼ã¶ã¼ã®å½¹å²: ããã¸ã§ã¯ããªã¼ãã¼ vs ã³ã¢éçºè vs ã«ã¸ã¥ã¢ã«ãªè²¢ç®è * ã¯ã¼ã¯ããã¼: ããã¸ã§ã¯ããæ¨å¥¨/å¼·å¶ãã¦ãããè²¢ç®ã®ããã®ã¯ã¼ã¯ããã¼ * ãµã¤ãº: 大ããããã¸ã§ã¯ãã¯å°ããããã¸ã§ã¯ãããããªã½ã¼ã¹ãè¦æ±ãã¾ãã å°ãªãã¨ã4ã¤ã®ä¸è¬çãªã¯ã¼ã¯ã¹ãã¼ã¹ã®æ§ææ¹æ³ãããã¾ãã * lightweight checkout * standalone tree * feature branches * switchable sandbox. åã¬ã¤ã¢ã¦ãã®ç°¡åãªèª¬æã以ä¸ã«è¨ãã¾ãã 軽éãã§ãã¯ã¢ã¦ã -------------------- ãã®ã¬ã¤ã¢ã¦ãã§ã¯ãä½æ¥ããªã¼ã¯ãã¼ã«ã«ã§ãããã©ã³ãã¯ãªã¢ã¼ãã«ããã¾ãã ããã¯CVSãSVNã§ä¸è¬çã«å©ç¨ãããã¬ã¤ã¢ã¦ãã§ãã·ã³ãã«ã§ç°¡åã«ç解ã§ãã¾ãã ã»ããã¢ããããã«ã¯:: bzr checkout --lightweight URL project cd project ä½æ¥ããã«ã¯:: (make changes) bzr commit (make changes) bzr commit åã³ããããæé»çã«å¤æ´ãåããã©ã³ããå©ç¨ãã¦ããä»ã®äººã«å ¬éãã¦ãããã¨ã«\ 注æãã¦ãã ããããã ããã³ããããæåããã«ã¯ä½æ¥ããªã¼ããªã¢ã¼ãã®ãã©ã³ãã®\ ææ°ã®ç¶æ ã«ãªã£ã¦ããå¿ è¦ãããã¾ããææ°ã®ã³ã¼ããåå¾ãã¦ãã¼ã¸ããã«ã¯ã:: bzr update ã¹ã¿ã³ãã¢ãã³ããªã¼ ---------------------- ãã®ã¬ã¤ã¢ã¦ãã§ã¯ãä½æ¥ããªã¼ã¨ãã©ã³ãã¯ä¸ã¤ã®å ´æã«ããã¾ãã å ±æãªãã¸ããªãä¸ä½ã®ãã£ã¬ã¯ããªã«ç¡ãéãããªãã¸ããªãåãå ´æã«\ æ ¼ç´ããã¾ããããã¯Bazaarã®ããã©ã«ãã¬ã¤ã¢ã¦ãã§ãå°è¦æ¨¡ããä¸è¦æ¨¡ã®\ 大ããã®ããã¸ã§ã¯ãã«é©ãã¦ãã¾ãã ã»ããã¢ãã:: bzr branch URL project cd project ä½æ¥:: (make changes) bzr commit (make changes) bzr commit å¤æ´ãä¸å¤®ã®å ´æã«å ¬éãã:: bzr push [URL] pushããURLã¯æåã®ä¸åã ãè¦æ±ããã¾ãã ããä¸å¤®ã®å ´æããpushããã¾ã§ã®éã«ä»ã®ã¦ã¼ã¶ã¼ããã®å¤æ´ãåãåã£ã¦ãã\ å ´åãpushããåã«ãããã®å¤æ´ããã¼ã«ã«ãã©ã³ãã«mergeããå¿ è¦ãããã¾ã:: bzr merge (resolve conflicts) bzr commit 代æ¿æ段ã¨ãã¦ããã§ãã¯ã¢ã¦ãã使ããã¨ãã§ãã¾ãããã©ã³ãã¨åãããã«\ ãã§ãã¯ã¢ã¦ããå±¥æ´å ¨ä½ããã¼ã«ã«ã«ã³ãã¼ãã¾ããããã¼ã«ã«ãã©ã³ãã\ ãªã¢ã¼ãã®å ´æã«æç¸ããã¦ããã®ã§ã両æ¹ã®ãã©ã³ãã«ä¸åº¦ã«ã³ãããããã¾ãã 注æ: ãã§ãã¯ã¢ã¦ãã¯ãã¼ã«ã«ã³ããã+pushã«æ¯ã¹ã¦ã¹ãã¼ãã§ãã ãã§ãã¯ã¢ã¦ãã¯ã¾ããªã¢ã¼ãã«ã³ããããã¦ããããæåããã¨ãã«ã ã\ ãã¼ã«ã«ã«ãã³ããããã¾ãã .. _feature-branches: æ©è½ãã©ã³ã -------------- ãã®ã¬ã¤ã¢ã¦ãã§ã¯ãããã¤ãã®ãã©ã³ãã¨ããªã¼ããã£ã¦ãä¸è¬çã«ãªãã¸ããªãå ±æãã¾ãã ä¸ã¤ã®ãã©ã³ã㯠"trunk" ã®ãã©ã¼ãä¿åãã¦ãã¦ããã以å¤ã®ä½æ¥åä½(ä¾:ãã°ä¿®æ£ã æ©è½è¿½å )ã«ã¯ããããã® "æ©è½ãã©ã³ã" ãä½ãã¾ãã ãã®ã¬ã¤ã¢ã¦ãã¯ã»ã¨ãã©ã®ããã¸ã§ã¯ããç¹ã«ä¸è¦æ¨¡ã®ãã®ã«ã¨ã£ã¦çæ³çã§ãã ã»ããã¢ãã:: bzr init-repo project cd project bzr branch URL trunk æ©è½ãã©ã³ããéå§ãã:: bzr branch trunk featureX cd featureX ä½æ¥ãã:: (make changes) bzr commit (make changes) bzr commit å¤æ´ãã¡ã¼ãªã³ã°ãªã¹ãã«å ¬éãã¦ã¬ãã¥ã¼&æ¿èªãã¦ããã:: bzr send å¤æ´ãå ¬éãã©ã³ãã§å ¬éãã(ãã¨ãã°Launchpadä¸ã§mergeè¦æ±ãåºãããã«):: bzr push [URL] å¤åå½¢ã¨ãã¦ãtrunkããã§ãã¯ã¢ã¦ãã¨ãã¦ä½ããã¨ãã§ãã¾ãã ããtrunkã¸ã®ã³ããã権éãæã£ã¦ããã®ã§ããã°ãtrunkã¸ãã¼ã¸ãã¦\ ã³ãããããã¨ãã®å¤æ´ã¯æé»çã«å ¬éããã¾ãã ä»ã«ã¯ãtrunkã®URLãèªã¿è¾¼ã¿å°ç¨ã ã£ãå ´å(ä¾: HTTP ã¢ãã¬ã¹)ããã§ãã¯ã¢ã¦ãã\ å©ç¨ãããã¨ã¯ãã¼ã«ã«ã®trunkãã©ã¼ã«ééãã¦å¤æ´ãç»é²ãã¦ãã¾ããã¨ã\ é²æ¢ãã¾ããããã¯ããã¸ã§ã¯ããPQMãªã©ã®ã²ã¼ããã¼ãã¼åã®ã¯ã¼ã¯ããã¼\ ãå©ç¨ãã¦ããã¨ãã«æç¨ã§ãã .. _local-sandbox: ãã¼ã«ã«ã®sandbox ------------------ ãã®ã¬ã¤ã¢ã¦ãã¯æ©è½ãã©ã³ãã®ã¬ã¤ã¢ã¦ãã¨ã»ã¼åãã§ãããæ©è½ãã©ã³ãã\ ããããä½æ¥ããªã¼ãæã¤ä»£ããã«ä¸ã¤ã®ä½æ¥ããªã¼ãå ±ç¨ããç¹ãéãã¾ãã ããã¯gitã®ããã©ã«ãã¬ã¤ã¢ã¦ãã«ä¼¼ã¦ãã¦ã大ããªããªã¼(10000ãã¡ã¤ã«ä»¥ä¸\ ã¨ã)ãæã¤ããã¸ã§ã¯ããããã«ãã«ããå å·¥ç©(.oã.classãã¡ã¤ã«ã¨ãã£ã)\ ã大éã«ä½ãããã¸ã§ã¯ãã«é©ãã¦ãã¾ãã ã»ããã¢ãã:: bzr init-repo --no-trees project cd project bzr branch URL trunk bzr checkout --lightweight trunk sandbox cd sandbox ããã§sandboxã§ä½æ¥ãéå§ã§ãã¾ãããsandboxãtrunkãåç §ããã¾ã¾ã³ããã\ ãã¦ãã¾ãã¨ã(trunkãcheckoutã§ç¡ãéã)trunkãå ã®trunkã®ãã©ã¼ã§ã¯\ ãªããªã£ã¦ãã¾ãã¾ãã ãªã®ã§ãã¾ãæ©è½branchãä½ã£ã¦sandboxããã¡ãã«ç´ã¥ãã¾ããã:: bzr branch ../trunk ../featureX bzr switch ../featureX ãã®å¾ã®ãå¤æ´ãè¡ã£ãããã®å¤æ´ãå ¬éãã¦é©ç¨ãã¦ãããã¾ã§ã®\ ããã»ã¹ã¯æ©è½ãã©ã³ãã¬ã¤ã¢ã¦ãã®æã¨åãã§ãã é²ãã ã¬ã¤ã¢ã¦ã ---------------- ãæã¿ã¨ããã°ãããªãã®ã好ã¿ã®æ§æã«åããã¦ã¬ã¤ã¢ã¦ãã決ãããã¨ãã§ãã¾ãã ä¾ãã¢ã¤ãã¢ã«ã¤ãã¦ã¯ `å ±æãªãã¸ããªã®ã¬ã¤ã¢ã¦ã <shared_repository_layouts.html>`_ ãåç §ãã¦ãã ããã