================= 5åã§ãããBazaar ================= .. _introduction: ã¤ã³ãããã¯ã·ã§ã³ =================== Bazaarã¯åæ£åãã¼ã¸ã§ã³ç®¡çã·ã¹ãã ã§ãã½ããã¦ã§ã¢ããã¸ã§ã¯ãã® å ±åä½æ¥ã楽ã«ãã¦ããã¾ãã ãããã5åã»ã©ã§ããã¡ã¤ã«ããã¼ã¸ã§ã³ç®¡çä¸ã«ç½®ããå¤æ´ãè¨é²ãã¦ã ä½æ¥å 容ã確èªããå ¬éãã¦ä½æ¥å 容ããã¼ã¸ãã¦ãããããã«ããã¸ã§ã¯ãã® trunk ã«éãæ¹æ³ãªã©ãå¦ã³ã¾ãã 詳細ãªç´¹ä»å 容ãæãã®ã§ããã°ã `ããã«å¦ã¶`_ ãã覧ãã ããã ã¤ã³ã¹ãã¼ã«æ¹æ³ ================= ãã®ã¬ã¤ãã§ã¯Bazaarãã¤ã³ã¹ãã¼ã«ããæ¹æ³ã説æãã¾ããããé常ã¯ã¨ã¦ãç°¡åã§ãã ã¤ã³ã¹ãã¼ã«æ¹æ³ã®æå¼ãã¯æ¬¡ã®éãã§ã: - **GNU/Linux:** ããããBazaarã¯ããªãã®GNU/Linuxãã£ã¹ããªãã¥ã¼ã·ã§ã³ã«å«ã¾ãã¦ãã¾ãã - **Windows:** `Windowsã®ããã®ã¤ã³ã¹ãã¼ã«ã®æå¼ã`_. - **Mac OS X:** `Mac OS Xã®ããã®ã¤ã³ã¹ãã¼ã«ã®æå¼ã`_. å¥ã®ãã©ãããã©ã¼ã ã¨ã½ã¼ã¹ã³ã¼ãããã¤ã³ã¹ãã¼ã«ããæ¹æ³ã«é¢ãã¦ã¯ã ãã¦ã³ãã¼ã_ 㨠ã¤ã³ã¹ãã¼ã«æ¹æ³_ ã®ãã¼ã¸ãåç §ãã¦ãã ããã .. _Windowsã®ããã®ã¤ã³ã¹ãã¼ã«ã®æå¼ã: http://wiki.bazaar.canonical.com/WindowsDownloads .. _Mac OS Xã®ããã®ã¤ã³ã¹ãã¼ã«ã®æå¼ã: http://wiki.bazaar.canonical.com/MacOSXBundle .. _ãã¦ã³ãã¼ã: http://wiki.bazaar.canonical.com/Download .. _ã¤ã³ã¹ãã¼ã«æ¹æ³: http://wiki.bazaar.canonical.com/InstallationFaq ã¾ãã¯èªå·±ç´¹ä» ================= ä½æ¥ã«ã¨ããããåã«ãã¾ãããªãã誰ãªã®ããBazaarã«æãã¦ããã¾ãããã ãããããã¨ã§ãå±¥æ´ã®ä¸ããããªãã®ä½æ¥ãæ£ç¢ºã«èå¥ãããã¨ãã§ãã¾ãã 次ã®ããã«å ¥åãã¦ãã ãã(ãã¡ãããããªãã®ååã¨Eã¡ã¼ã«ã¢ãã¬ã¹ã§):: $ bzr whoami "John Doe <john.doe@gmail.com>" ããããã¨Bazaarã¯ãããªãã®ååãEã¡ã¼ã«ã¢ãã¬ã¹ãå ¥ã£ãè¨å®ãã¡ã¤ã«ãä½æ\ ãããã¯ä¿®æ£ãã¾ãã ååã¨Eã¡ã¼ã«ã¢ãã¬ã¹ãæ£ããç»é²ããã¦ããã確èªãã¾ããã :: $ bzr whoami John Doe <john.doe@gmail.com> ãã¡ã¤ã«ããã¼ã¸ã§ã³ç®¡çãã ============================= Bazaarã§æ±ããã£ã¬ã¯ããªã¨ããã¤ãã®ãã¡ã¤ã«ãä½ãã¾ããã:: $ mkdir myproject $ cd myproject $ mkdir subdirectory $ touch test1.txt test2.txt test3.txt subdirectory/test4.txt **Windowsã¦ã¼ã¶ã¼ã®ããã®æ³¨æ:** Windows Explorerã使ã£ã¦ãã£ã¬ã¯ããªãä½æãã\ ãã®ãã£ã¬ã¯ããªã®ä¸ã§å³ã¯ãªãã¯ãã㦠``æ°è¦ä½æ`` ãé¸æãããã¡ã¤ã«ãä½æãã¾ãã Bazaarã«ããªãã®ããã¸ã§ã¯ããã£ã¬ã¯ããªãåæåããã¾ããã:: $ bzr init ä½ãèµ·ãã¦ããªãããã«è¦ãã¦ãå¿é ããªãã§ãã ããã Bazaarã¯ãã¡ã¤ã«ã¨ãªãã¸ã§ã³ã®å±¥æ´ãä¿åãã branch_ ãä½ãã¾ããã .. _branch: http://wiki.bazaar.canonical.com/Branch 次ã®ã¹ãããã¯Bazaarã«ç®¡çãã¦æ¬²ãããã¡ã¤ã«ãæãããã¨ã§ãã ``bzr add`` ãå®è¡ããã¨ãã¹ã¦ã®ãã£ã¬ã¯ããªã¨ãã¡ã¤ã«ãããã¸ã§ã¯ãã«\ å帰çã«è¿½å ããã¾ãã :: $ bzr add added subdirectory added test1.txt added test2.txt added test3.txt added subdirectory/test4.txt 次ã«ããããããã©ã³ãã«ã³ããããã¦ã¹ãããã·ã§ãããã¨ãã¾ãã ã³ããããè¡ã£ãçç±ã説æããã¡ãã»ã¼ã¸ã追å ãã¾ãã :: $ bzr commit -m "Initial import" Bazaarã¯åæ£åãã¼ã¸ã§ã³ç®¡çã·ã¹ãã ãªã®ã§ãã³ãããããããã«\ ãµã¼ãã¼ã«æ¥ç¶ããå¿ è¦ã¯ããã¾ããã 代ããã«ãBazaarã¯ãã©ã³ãã¨ãã¹ã¦ã®ã³ããããããªããä½æ¥ãã¦ãã\ ãã£ã¬ã¯ããªå é¨ã« ``.bzr`` ã¨ãããµããã£ã¬ã¯ããªãä½ã£ã¦ããã« ä¿åãã¾ãã ãã¡ã¤ã«ãå¤æ´ãã =================== ãã¡ã¤ã«ãå¤æ´ãã¦ãã©ã³ãã«ãã®å¤æ´ãã³ããããã¦ã¿ã¾ãããã 好ããªã¨ãã£ã¿ã§ ``test1.txt`` ãç·¨éããä½ãè¡ã£ãã®ãã確èªãã¾ãã :: $ bzr diff === modified file 'test1.txt' --- test1.txt 2007-10-08 17:56:14 +0000 +++ test1.txt 2007-10-08 17:46:22 +0000 @@ -0,0 +1,1 @@ +test test test ä½æ¥ãBazaarã®ãã©ã³ãã«ã³ããããã¾ã:: $ bzr commit -m "Added first line of text" Committed revision 2. ãªãã¸ã§ã³ã®ãã°ãçºãã ========================= ãã°ãé²è¦§ãããã¨ã§ãã©ã³ãã®å±¥æ´ã調ã¹ããã¨ãã§ãã¾ãã :: $ bzr log ------------------------------------------------------------ revno: 2 committer: John Doe <john.doe@gmail.com> branch nick: myproject timestamp: Mon 2007-10-08 17:56:14 +0000 message: Added first line of text ------------------------------------------------------------ revno: 1 committer: John Doe <john.doe@gmail.com> branch nick: myproject timestamp: Mon 2006-10-08 17:46:22 +0000 message: Initial import ãã©ã³ãã Launchpad ã§å ¬éãã =================================== Launchpad ã¯ã½ããã¦ã§ã¢ããã¸ã§ã¯ãã®éçºã¨éå¶ã®ããã®ãã¼ã«ãã¾ã¨ãã ãµã¤ãã§ããèªåã®ãã©ã³ããå ¬éããããã« Launchpad ãå©ç¨ãããã¨ãã§ãã¾ãã (ãã¡ãããèªåã®ãµã¼ãã¼ãä»ã®ãã¹ãã£ã³ã°ãµã¼ãã¹ä¸ã§å ¬éãããã¨ãã§ãã¾ã) ã¾ã Launchpad ã®ã¢ã«ã¦ã³ããæã£ã¦ããªãã®ã§ããã°ã `account signup guide`_ ã«å¾ã£ã¦ã¢ã«ã¦ã³ããä½æãã `SSH éµãç»é²`_ ãã¦ãã ããã .. _account signup guide: https://help.launchpad.net/CreatingYourLaunchpadAccount .. _SSH éµãç»é²: https://launchpad.net/people/+me/+editsshkeys 次ã®ããã«ã (``john.doe`` ã¯èªåã®ã¢ã«ã¦ã³ãã®ã¦ã¼ã¶ã¼åã«ç½®ãæãã¦) ã¿ã¤ããã¦ãã ããã [#]_ :: $ bzr push lp:~john.doe/+junk/myproject .. [#] ``lp:`` ã¨ãã URL ã¹ãã¼ã㯠bzr 0.92 以éã§ãµãã¼ãããã¦ãã¾ãã **注æ**: ``+junk`` ã®é¨åã¯ããã®ãã©ã³ãã Launchpad ä¸ã®ç¹å®ã®ããã¸ã§ã¯ãã« å±ãã¦ããªããã¨ãæå³ãã¦ãã¾ãã ããã§ã誰ã§ãããªãã®ãã©ã³ãã®ã³ãã¼ãã次ã®ãããªã³ãã³ãã§å ¥æã§ããããã«ãªãã¾ããã :: $ bzr branch lp:~john.doe/+junk/myproject ãã©ã³ãã®æ å ±ããå±¥æ´ãå«ã㦠https://code.launchpad.net/people/+me/+junk/myproject ããé²è¦§ãããã¨ãã§ãã¾ãã å¥ã®ãã©ã³ãããèªåç¨ã®ã³ãã¼ãä½ã ===================================== ä»äººã®ã³ã¼ãã«åãçµãããã«ããã©ã³ãã®ã³ãã¼ãä½ããã¨ãã§ãã¾ãã å®éã®ä¸çã®ä¾ã¨ãã¦ãBazaarã®GTKã¤ã³ã¿ã¼ãã§ã¤ã¹ãè¦ã¦ã¿ã¾ããã:: $ bzr branch lp:~bzr/bzr-gtk/trunk bzr-gtk.john Branched 292 revision(s). Bazaarã¯bzr-gtkã®trunkãã©ã³ããããã¹ã¦ã®ãã¡ã¤ã«ããã¦ã³ãã¼ãã㦠ãªãã¸ã§ã³ã®å±¥æ´ãããããbzr-gtk.johnã¨ããã³ãã¼ãä½ãã¾ãã ããã§ããã©ã³ãã®ã³ãã¼ãæã«å ¥ããã®ã§ãããã®æ¥ç¶ã®ãããªãã« é¢ãããå¤æ´ãã³ãããã§ãã¾ãã ãã©ã³ãã¯ãã¤ã§ãå ¬éãããã¨ã§å ±æã§ããbzr-gtkãã¼ã ãããªãã®ä½åã 使ãããã¨æã£ãã¨ãã«Bazaarã¯å½¼ããããªãã®ãã©ã³ãããå½¼ãã®ãã©ã³ãã« ãã¼ã¸ãç´ãä½æ¥ãç°¡åã«ãã¦ããã¾ãã ã¡ã¤ã³ã®ãã©ã³ãããèªåã®ãã©ã³ããæ´æ°ãã ============================================= å¤æ´ãèªåã®ãã©ã³ãã«ã³ããããã¦ããéã«ãä»ã®äººãã³ã¼ããå ã®ãã©ã³ãã«\ ã³ããããã¦ããã¨ãããã¨ãããããã¾ãã èªåã®ãã©ã³ããææ°ã«ç¶æããã«ã¯ã親ãã©ã³ãããèªåã®ãã©ã³ãã¸ã¨å¤æ´ã\ ãã¼ã¸ãã¾ã:: $ bzr merge Merging from saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk All changes applied successfully. ä½ãå¤æ´ãããã®ã確èªãã¾ã:: $ bzr diff å¤æ´ã«æºè¶³ããããããããèªåã®ãã©ã³ãã«ã³ããããã¾ã:: $ bzr commit -m "Merge from main branch" Committed revision 295. ä½æ¥ã親ã®ãã©ã³ãã«ãã¼ã¸ãã ============================== bzr-gtkã®å人ãã©ã³ãã«åãçµãã å¾ã§ãããªãã®å¤æ´ãä¸æµã®ããã¸ã§ã¯ãã«\ æ»ããããã¨ãããããããã¾ããã æãç°¡åãªæ¹æ³ã¯ãã¼ã¸ãã£ã¬ã¯ãã£ãã使ããã¨ã§ãã ãã¼ã¸ãã£ã¬ã¯ãã£ã(merge directive)ã¨ã¯ãã³ã³ãã¥ã¼ã¿ã«ç¹å®ã®ãã¼ã¸ãå®è¡\ ãããããã®ãªã¯ã¨ã¹ãã§ãã ãã¼ã¸ãã£ã¬ã¯ãã£ãã¯å¤§æµããã¼ã¸ãã¬ãã¥ã¼ããããã®ãããã¨ããã¼ã¸ãå®è¡ãã\ ã®ã«å¿ è¦ã¨ãªããªãã¸ã§ã³ããããã¯ãªãã¸ã§ã³ãåå¾ã§ãããã©ã³ããå«ã¿ã¾ãã 次ã®ã³ãã³ãã® ``mycode.patch`` ãé©å½ãªååã«æ¸ãæãã¦ããã¼ã¸ã®ãã£ã¬ã¯ãã£ããä½ãã¾ã:: $ bzr send -o mycode.patch Using saved parent location: http://bazaar.launchpad.net/~bzr/bzr-gtk/trunk ããã§bzr-gtkã®ããã¸ã§ã¯ãã«ãã¼ã¸ãã£ã¬ã¯ãã£ããEã¡ã¼ã«ã§éããã¨ãå¯è½ã«\ ãªãã¾ãããå½¼ããç´å¾ããã°ã親ãã©ã³ãã«ãã¼ã¸ãããã¨ãã§ãã¾ãã ããã«å¦ã¶ ========== Bazaarã«é¢ãã詳細ãªå 容㯠`Bazaarã®ã¦ã¼ã¶ã¼ã¬ã¤ã <../user-guide/index.html>`_ ã§èª¿ã¹ããã¨ãã§ãã¾ãã ã³ãã³ãã©ã¤ã³ã§Bazaarãå¦ã¶ã«ã¯:: $ bzr help Bazaarã®ã³ãã³ããå¦ã¶ã«ã¯:: $ bzr help commands ''foo'' ãããã¯ãããã¯ã³ãã³ããå¦ã¶ã«ã¯:: $ bzr help foo Licence ============= Copyright 2007-2011 Canonical Ltd. Bazaar is free software, and you may use, modify and redistribute both Bazaar and this document under the terms of the GNU General Public License version 2 or later. See <http://www.gnu.org/licenses/>. æ¥æ¬èªè¨³ã«ã¤ã㦠----------------- ãã®æ¥æ¬èªè¨³ã¯ã `Bazaar-jaã°ã«ã¼ã <https://groups.google.com/group/bazaar-ja>`_ ãã¡ã³ããã³ã¹ãã¦ãã¾ãã æ¥æ¬èªè¨³ã«çãã¦ééãã質åçããã¾ããããã¡ãã¸ãé¡ããã¾ãã