ééããåãæ¶ã ================ ééãã¯èµ·ãã --------------- Bazaarã¯ä¸è¨ã§èª¬æããããããªééãããç°¡åã«ãªã«ãã¼ã§ããããã« è¨è¨ããã¦ãã¾ãã ããã¸ã§ã¯ãã®ãªãã¸ã§ã³ã®å±¥æ´ããããããã --------------------------------------------- æããããééã£ãããªã¼ããã¼ã¸ã§ã³ç®¡çä¸ã«ç½®ããã¨ãã¦ãã ``.bzr`` ãã£ã¬ã¯ããªãåé¤ããã ãã§æ¸ã¿ã¾ãã ãã¡ã¤ã«ãããã¯ãã£ã¬ã¯ããªã®ç»é²ã解é¤ãã --------------------------------------------- ãã¼ã¸ã§ã³ç®¡çä¸ã«ç½®ããããªããã¡ã¤ã«ãæãããã ``add`` ã³ãã³ãã§ç»é²ãã¦ãã ãããå¿ããããã«Bazaarã«ãããå¿ããããããã« ``remove`` ã³ãã³ãã使ç¨ã§ãã¾ãã ``remove`` ã¯ä¿®æ£ããããã¡ã¤ã«ãåé¤ãããªããã« *å®å ¨ã«ç©äºãè¡ã* ããã«è¨è¨ããã¦ãã¾ãããã¨ãã°:: bzr add foo.html (oops - didn't mean that) bzr remove foo.html ãã®ã³ãã³ãã¯ä¿®æ£ããããããã¯æªç¥ã®ãã¡ã¤ã«ã«ã¤ãã¦ã¯ã¨ã©ã¼ãåºåãã¾ãã ãã¡ã¤ã«ãç¶æãããã®ã§ããã°ã ``--keep`` ãªãã·ã§ã³ã使ãã¾ãã 代ããã«ããã¡ã¤ã«ãåé¤ãããã®ã§ããã°ã ``--force`` ãªãã·ã§ã³ã使ãã¾ã:: bzr add foo.html (oops - didn't mean that) bzr remove --keep foo.html (foo.html ã¯ãã£ã¹ã¯ã«ã¯æ®ãããã©ããbzrã«ã¯ç»é²ãããªã) ä¸æ¹ã§ãæªå¤æ´ã® ``TODO`` ãã¡ã¤ã«ã¯ç»é²ã解é¤ããã¨ã©ã¼åºåãªãã§ãã£ã¹ã¯ããåé¤ããã¾ã:: bzr add TODO bzr commit -m "added TODO" (hack, hack, hack - but don't change TODO) bzr remove TODO (TODO ãã¡ã¤ã«ã¯åé¤ããã) 注: IDEãããã¯ãªãã¬ã¼ãã£ã³ã°ã·ã¹ãã ã®ãã¡ã¤ã«ããã¼ã¸ã£ã¼ã\ å©ç¨ãã¦ãã¡ã¤ã«ãåé¤ããå ´åã ``commit`` ã³ãã³ãã¯ãããåé¤\ ããããã®ã¨ãã¦æé»ã®ãã¡ã«æ±ãã¾ãã æå¾ã®ã³ããã以éã®å¤æ´ãåãæ¶ã ---------------------------------- ãã¼ã¸ã§ã³ç®¡çãã¼ã«ã使ãçç±ã®1ã¤ã¯ä½æ¥ããã¦ããéã«ããªã¼ã®ã¹ãã¼ã¿ã¹ã楽ã«èª¿ã¹ããããã¨ã§ãã ææ°ã® ``commit`` 以éã®å¤æ´ãå»æ£ãããã¨ã決å¿ãããã使ãã³ãã³ã㯠``revert`` ã§ã:: bzr revert äºåã®è¦åã¨ãã¦ã å®éã«ãã¹ã¦ãæ¬å½ã«å»æ£ããããã¨ã確èªããããã« ``bzr status`` 㨠``bzr diff`` ãæåã«ä½¿ããã¨ã¯ããç¿æ £ã§ãã æå¾ã®ã³ããã以éã®ãã¡ã¤ã«ã¸ã®å¤æ´ãåãæ¶ã ----------------------------------------------- æå¾ã®ã³ããã以éã®ç¹å®ã®ãã¡ã¤ã«ã®å¤æ´ãåãæ¶ãããããããªã¼ã®ä»ã®ãã¹ã¦ã®å¤æ´ãç¶æãããå ´åã ãã¡ã¤ã«ã®ååãå¼æ°ã¨ã㦠``revert`` ã«æ¸¡ãã¾ã:: bzr revert foo.py æå¾ã®ã³ããããåãæ¶ã ------------------------- æå³ããªãã³ãããããã¦ãã¾ã£ãããåãæ¶ãããã« ``uncommit`` ã³ãã³ãã使ãã¾ã:: bzr uncommit ``revert`` ã¨ã¯ç°ãªãã ``uncommit`` ã¯ä½æ¥ã®ããªã¼ã®å 容ããã®ã¾ã¾ã«ãã¾ãã æå³ããã«ééã£ãã¨ã©ã¼ã¡ãã»ã¼ã¸ãã³ããããã¦ãã¾ã£ãå ´åãããã¯æ¬å½ã«éå®ãã¾ã:: bzr commit -m "Fix bug #11" (damn - wrong bug number) bzr uncommit bzr commit -m "Fix bug #1" ã³ããããåãæ¶ãå¥ã®çç±ã¯1ã¤ãããã¯è¤æ°ã®ãã¡ã¤ã«ã®è¿½å ãå¿ããããã¨ãããã®ã§ã ã ãããé¿ããããã«ãæªç¥ã®ãã¡ã¤ã«ãããªã¼ã®ä¸ã§è¦ã¤ããã¨ã³ããããã¨ã©ã¼ã«ãªãããã« ``commit`` ã ``commit --strict`` ã®ã¨ã¤ãªã¢ã¹ã«ãã人ããã¾ãã 注: ``merge`` ã³ãã³ãã¯æ¬¡ã®ç« ã¾ã§ç´¹ä»ãã¾ãããã ``uncommit`` ã§è¿½å ãããã¼ã¸ããªã¹ãã¢ãããã¨ã¯ç¡æå³ã§ãã (``uncommit`` ã®å¾ã§ ``bzr status`` ãå®è¡ããã¨ãããã表示ããã¾ã) ``merge`` ã¯å±¥æ´ã®åã®æ¹ã®æå®ããã³ãããã ããå¹çè¯ãåãæ¶ãããã«ã使ããã¾ãã ``merge`` ã«é¢ãã詳細ãªæ å ±ã¯ æ¬¡ã®ç« ã® `å¤æ´ããã¼ã¸ãã <merging_changes.html>`_ ã¨Bazaarã®ã¦ã¼ã¶ã¼ãªãã¡ã¬ã³ã¹ãåç §ãã¦ãã ããã è¤æ°ã®ã³ããããåãæ¶ã ------------------------ è¤æ°ã®ã³ããããåãæ¶ãããã«ã¯ -r ãªãã·ã§ã³ã使ãã¾ã:: bzr uncommit -r -3 ãããè¡ãããã®çç±ãæ¬å½ã«ããã¤ãã®å¤æ´ãç ´æ£ãããã®ã§ãããªãã ``uncommit`` ã¯ä½æ¥ããªã¼ãå¤æ´ããªããã¨ãè¦ãã¦ããã¦ãã ãã: ã¿ã¹ã¯ãå®äºããããã¨ã¨åãããã«ãããã ``revert`` ã³ãã³ããå®è¡ããå¿ è¦ãããã¾ãã ãããå¤ãã®å ´åãå±¥æ´ããã®ã¾ã¾ã«ãã¦ãããææ°ã®ããç¶æ ã®å 容ãåæ ãã æ°ãããªãã¸ã§ã³ã追å ããæ¹ãééããªããã¿ã¼ã§ãã éå»ã®ãã¼ã¸ã§ã³ã®ç¶æ ã«æ»ã ----------------------------- æã¾ãªãå¤æ´ãè¡ã£ãããã³ã¼ããã¦ã¼ã¶ã¼ã«å ¬éããã¦ããã®ã§ã³ãããã®åãæ¶ããåççã§ã¯ãªãå ´åã ä½æ¥ããªã¼ãæãç¶æ ã«æ»ãããã« ``revert`` ãå©ç¨ã§ãã¾ã:: % bzr commit "Fix bug #5" Committed revision 20. (release the code) (hmm - bad fix) bzr revert -r 19 bzr commit -m "Backout fix for bug #5" ãã®ä½æ¥ã«ãã£ã¦ããªã¼å ¨ä½ããªãã¸ã§ã³19ã®ç¶æ ã«å¤æ´ãã¾ãã ãã以éã¯æ°ããã³ãããããã¦ããªããã°ããããããããããªãã®ãããå¯ä¸ã®ãã¨ã§ãã æ°ããã³ãããããã¦ããå ´åã¯ã ``revert`` ã¯ãããæ¶ãã¦ãã¾ãã¾ãã ãã®å ´åã¯ããããä¿®æ£ãåãæ¶ã代ããã« `ãªãã¼ã¹ãã§ãªã¼ãã㯠<adv_merging.html#reverse-cherrypicking>`_ ã使ãæ¹ãããã§ãããã 注: 19ã®ãããªçµ¶å¯¾çãªãªãã¸ã§ã³çªå·ã®ä»£ããã«ã è² ã®æ°ã使ã£ã¦ããã(-1)ã¨ç¸å¯¾çãªãªãã¸ã§ã³ãæå®ã§ãã¾ã:: bzr revert -r -2 ã¿ã°ãè¨æ£ãã ---------------- æ©ã¾ã£ã¦ã¿ã°ãå®ç¾©ããã®ãªãã ``tag`` ã³ãã³ãã® ``--force`` ãªãã·ã§ã³ã使ã£ã¦åå®ç¾©ãã¾ã:: bzr tag 2.0-beta-1 (oops, we're not yet ready for that) (make more commits to include more fixes) bzr tag 2.0-beta-1 --force ã¿ã°ãã¯ãªã¢ãã ----------------- ã¿ã°ãå®ç¾©ããã使ããããªãã®ã§ããã°ãåé¤ããããã«ã ``tag`` ã³ãã³ãã® ``--delete`` ãªãã·ã§ã³ã使ããã¨ãã§ãã¾ã:: bzr tag 2.0-beta-4 (oops, we're not releasing a 4th beta) bzr tag 2.0-beta-4 --delete