ã³ã¢ã®æ¦å¿µ =========== åç´ãªã¦ã¼ã¶ã¼ã¢ãã« --------------------- Bazaarã使ãããã«ç解ããå¿ è¦ã®ããæ¦å¿µã¯4ã¤ããã¾ã: * **ãªãã¸ã§ã³(Revision)** - åãçµããã¡ã¤ã«ã®ã¹ãããã·ã§ãã * **ä½æ¥ããªã¼(Working tree)** - ãã¼ã¸ã§ã³ç®¡çããããã¡ã¤ã«ã¨ãµããã£ã¬ã¯ããªãå«ããã£ã¬ã¯ã㪠* **ãã©ã³ã(Branch)** - ãã¡ã¤ã«ã®å±¥æ´ãè¨è¿°ãããé åºã¥ãããããªãã¸ã§ã³ã®éå * **ãªãã¸ããª(Repository)** - ãªãã¸ã§ã³ã®è²¯èµå ´æ ããããã詳ããè¦ã¦ã¿ã¾ãããã ãªãã¸ã§ã³ ----------- ãªãã¸ã§ã³ã¯ãã¡ã¤ã«ã¨ãã£ã¬ã¯ããªã®å 容ã¨å½¢ãå«ããããã®ããªã¼ã®ç¶æ ã® **ã¹ãããã·ã§ãã** ã§ãã ãªãã¸ã§ã³ã¯ããèªèº«ã«é¢é£ã¥ããããã¡ã¿ãã¼ã¿ãããã¤ãå«ã¿ã¾ããã¡ã¿ãã¼ã¿ã«ã¯æ¬¡ã®ãããªãã®ãå«ã¾ãã¾ã: * ã³ããããã人 * ã³ãããããæé * ã³ãããã¡ãã»ã¼ã¸ * ãã®ãªãã¸ã§ã³ã®å ã«ãªã£ã親ã®ãªãã¸ã§ã³ ãªãã¸ã§ã³ã¯ä¸å¤ã§ãã°ãã¼ãã«ãã¤ã¦ãã¼ã¯ã« **ãªãã¸ã§ã³id (revision-id)** ã§èå¥ã§ãã¾ãã ãªãã¸ã§ã³idã®ä¾ã¯æ¬¡ã®ã¨ããã§ã:: pqm@pqm.ubuntu.com-20071129184101-u9506rihe4zbzyyz ãªãã¸ã§ã³idã¯ã³ãããããããããã¯ä»ã®ã·ã¹ãã ããã¤ã³ãã¼ãããæç¹ã§çæããã¾ãã ãªãã¸ã§ã³idã¯å é¨ã§å©ç¨ããã¨ããå¤é¨ãã¼ã«ã¨ã®çµ±åã«å¿ è¦ã§ããã ãã©ã³ãåºæã® **ãªãã¸ã§ã³çªå·** (*revision numbers*)ã®æ¹ã人éã«å¥½ã¾ããã¤ã³ã¿ãã§ã¼ã¹ã«\ ãªãã¾ãã ãªãã¸ã§ã³çªå·ã¯ 1 ã 42 ã 2977.1.59 ã®ããã«ãããã§åºåããã10é²æ³ã®èå¥åã§\ ãã©ã³ãã«å¯¾ãããªãã¸ã§ã³çªå·ã®ã°ã©ããéãã¦ãã¹ã追跡ãã¾ãã ãªãã¸ã§ã³çªå·ã¯ä¸è¬çã«ãªãã¸ã§ã³idãããçããåç¬ã®ãã©ã³ãã®ç¯å²ã§ã¯ ãããã®é¢ä¿ãç解ããããã«ãããããæ¯è¼ã§ãã¾ãã ãã¨ãã°ããªãã¸ã§ã³10ã¯ãªãã¸ã§ã³9ã®ç´å¾ã®ã¡ã¤ã³ã©ã¤ã³(ä¸è¨ãåç §)ã®ãªãã¸ã§ã³ã§ãã ãªãã¸ã§ã³çªå·ã¯ã³ãã³ããå®è¡ããã¦ããã¨ãã«çæããã¾ãã ãããã¯ãã©ã³ãå ã§ã©ã®ãªãã¸ã§ã³ãããã(ããªãã¡ææ°ã®ãªãã¸ã§ã³)ã§ãããã«ä¾åããããã§ãã Bazaarã§æå®ã§ãããªãã¸ã§ã³ã¨ãªãã¸ã§ã³ã®ç¯å²ã®ããã¤ãã®æ¹æ³ã«é¢ãã¦ã¯ãä»é²ã® `ãªãã¸ã§ã³ãæå®ãã <specifying_revisions.html>`_ ãåç §ãã¦ãã ããã ãªãã¸ã§ã³ã®çªå·ä»ãã®è©³ç´°ã«é¢ãã¦ã¯ `ãªãã¸ã§ã³çªå·ãç解ãã <zen.html#understanding-revision-numbers>`_ ãåç §ãã¦ãã ããã .. *TODO: add diagram* ä½æ¥ããªã¼ ------------ ä½æ¥ããªã¼(working tree)㯠ã¦ã¼ã¶ã¼ãç·¨éã§ãããã¡ã¤ã«ãä¿æãã *ãã¼ã¸ã§ã³ç®¡çããããã£ã¬ã¯ããª* ã§ãã ä½æ¥ããªã¼ã¯ *ãã©ã³ã* ã«é¢é£ä»ãããã¾ãã å¤ãã®ã³ãã³ãã¯ä½æ¥ããªã¼ãããããã®æèã§ä½¿ãã¾ãã ãã¨ãã°ã ``commit`` ã³ãã³ãã¯ä½æ¥ããªã¼ã®ä¸ã®ãã¡ã¤ã«ã®\ ç¾å¨ã®å 容ãå©ç¨ãã¦æ°ãããªãã¸ã§ã³çªå·ãä½ãã¾ãã .. *TODO: add diagram* ãã©ã³ã --------- æãã·ã³ãã«ãªå ´åããã©ã³ã㯠*é åºã¥ããããä¸é£ã®ãªãã¸ã§ã³* ã§ãã æçµãªãã¸ã§ã³ã¯ *ããã(tip)* ã¨ãã¦ç¥ããã¾ãã ãã©ã³ãã¯åãããããã®å¾åçµå(*marged* back)ãããããã¦ã\ ã°ã©ãã®å½¢ãã¨ãã¾ãã æè¡çã«ããã°ãã°ã©ãã¯(親ã¨åã®ãªãã¸ã§ã³ã®é)ã®æè¡ãªé¢ä¿ã表ãã\ ã«ã¼ããåå¨ããªãã®ã§ã *directed acyclic graph* (DAG) ã¨ãã¦\ è¨åãããããããã¾ããã ãã®ååã«ã®ã§ãã¨ããããããã¾ãããããå¿é ãªãã è¦ãã¦ããã¹ãéè¦ãªãã¨ã¯æ¬¡ã®ã¨ããã§ã: * DAGã®ç¯å²å ã§ã®éçºã®ä¸»è¦ãªã©ã¤ã³ã¯ *ã¡ã¤ã³ã©ã¤ã³(mineline)*, *ãã©ã³ã¯(trunk)*, ãããã¯åã« *å·¦å´(left hand side: LHS)* ã¨å¼ã°ãã¾ãã * ãã©ã³ãã¯ã¡ã¤ã³ã©ã¤ã³ã§ã¯ãªãéçºã©ã¤ã³ãæã¤ãã¨ãããã¾ãã ãã®ã¨ããå¥ã®ã©ã¤ã³ã¯ããæç¹ã§å§ã¾ãå¥ã®æç¹ã§çµããã¾ãã .. *TODO: add diagram* ã¬ãã¸ã㪠----------- ã¬ãã¸ããªã¯ã·ã³ãã«ã«ããã° *ãªãã¸ã§ã³ã®ä¿ç®¡å ´æ* ã§ãã æãã·ã³ãã«ãªäºä¾ã§ã¯ãããããã®ãã©ã³ããç¬èªã®ã¬ãã¸ããªãæã¡ã¾ãã\ å¥ã®äºä¾ã§ã¯ããã£ã¹ã¯ã®ä½¿ç¨éãæé©åããããã«ãã©ã³ãã«å¯¾ãã¦ã¬ãã¸ããªã\ å ±ç¨ãã¦ãã¾ãã .. *TODO: add diagram* æ¦å¿µãã¾ã¨ãã --------------- ä¸è¨ã®æ¦å¿µãææ¡ããããBazaarã®ãã¾ãã¾ãªä½¿ãæ¹ãç解ãããããªãã¾ãã Bazaarã®æãã·ã³ãã«ãªä½¿ãæ¹ã¯ *ã¹ã¿ã³ãã¢ãã³ããªã¼(standalone tree)* ã§ã\ ããã¯1ã¤ã®ä½ç½®ã«ä½æ¥ããªã¼ããã©ã³ãã¨ã¬ãã¸ããªã®ãã¹ã¦ãå«ã¾ãã¾ãã ä»ã®ããããã·ããªãªã«ã¯æ¬¡ã®ãããªãã®ãããã¾ã: * `å ±ç¨ãªãã¸ããª(shared branch) <branching_a_project.html#a-reminder-about-shared-repositories>`_ - ä½æ¥ããªã¼ã¨ãã©ã³ãã¯åããã£ã¬ã¯ããªã«ããã¾ããããªãã¸ããªã¯é«ãé層ã®\ ãã£ã¬ã¯ããªã«åå¨ãã¾ãã * `ã¹ã¿ãã¯ãã©ã³ã(stacked branch) <stacked.html>`_ - 親ã®ãªãã¸ããªã¨å ±éãªãªãã¸ã§ã³ã¯è¦ªã®ãªãã¸ããªã®ãã®ãå©ç¨ãããã¨ã§ã ãã©ã³ãã¯ã¦ãã¼ã¯ãªãªãã¸ã§ã³ã ããä¿åãã¾ãã * `軽éãã§ãã¯ã¢ã¦ã(lightweight checkout) <using_checkouts.html#getting-a-lightweight-checkout>`_ - ä½æ¥ããªã¼ã¨ã¯å¥ã®å ´æã«ãã©ã³ããä¿åããã¾ãã Bazaarã使ãæè¯ã®æ¹æ³ã¯ãããªãã®ãã¼ãºæ¬¡ç¬¬ã§ãã 次ã«å ±éã®ã¯ã¼ã¯ããã¼ãè¦ã¦ã¿ã¾ãããã