Shelving Changes ================ ã¨ãã©ããä½æ¥ããªã¼ããä¸æçã«å¤æ´ç¹ãåãé¤ãã¦ããã¨ã§å ã«æ»ããããã¨ã\ ããããããã¾ããã ãã¨ãã°ä½ãä½æ¥ä¸ã«å°ãããã°ãã£ãã¯ã¹ãè¦ã¤ãã¦ã³ãããããå ´åãªã©ã§ãã Bazaarã¯å¤æ´ã ``shelf`` (æ¸æ£)ã«ä¿åããæ©è½ãæã£ã¦ãã¾ãã å¾ã§å¤æ´ãå ã«æ»ããããªã£ãã¨ãã¯ã ``unshelve`` ã使ã£ã¦ä½æ¥ããªã¼ã«æ»ã\ ãã¨ãã§ãã¾ãã ãã¨ãã°ãä¸ã¤ãè¤æ°ã®å¤æ´ããããä½æ¥ããªã¼ãèãã¦è¦ã¾ã...:: $ bzr diff === modified file 'description.txt' --- description.txt +++ description.txt @@ -2,7 +2,7 @@ =============== These plugins -by Michael Ellerman +written by Michael Ellerman provide a very fine-grained 'undo' facility @@ -11,6 +11,6 @@ This allows you to undo some of your changes, -commit, and get +perform a commit, and get back to where you were before. ``shelve`` ã³ãã³ãã¯ã¤ã³ã¿ã©ã¯ãã£ãã«ã©ã®å¤æ´ãä½æ¥ããªã¼ã«ä¿çãã¦\ ããããã®ãã質åãã¾ãã:: $ bzr shelve --- description.txt +++ description.txt @@ -2,7 +2,7 @@ =============== These plugins -by Michael Ellerman +written by Michael Ellerman provide a very fine-grained 'undo' facility Shelve? [yNfrq?]: y --- description.txt +++ description.txt @@ -11,6 +11,6 @@ This allows you to undo some of your changes, -commit, and get +perform a commit, and get back to where you were before. Shelve? [yNfrq?]: n Shelve 2 change(s)? [yNfrq?]', 'y' Selected changes: M description.txt Changes shelved with id "1". ããããããã®å¤æ´ãä½æ¥ããªã¼ã«ããã®ã§ããã°ã ``shelve`` ã³ãã³ã\ ã«ãã¡ã¤ã«ã®ãªã¹ãã渡ãã¦ããããã®ãã¡ã¤ã«ã®å¤æ´ã ãã«ã¤ãã¦è³ªå\ ãããããã«ãããã¨ãã§ãã¾ãã å¤æ´ã shelve ããå¾ã« ``diff`` ã³ãã³ãã§ä½æ¥ããªã¼ã«æå¾ ããå¤æ´ã ãã\ æ®ã£ã¦ãããã¨ã確èªããã¨ããã§ãããã:: $ bzr diff === modified file 'description.txt' --- description.txt +++ description.txt @@ -2,7 +2,7 @@ =============== These plugins -by Michael Ellerman +written by Michael Ellerman provide a very fine-grained 'undo' facility ãã! - ã³ãããããæºåãã§ãã¾ãã:: $ bzr commit -m "improve first sentence" å¾ã«ãªã£ã¦ãshelveããå¤æ´ãä½æ¥ããªã¼ã« ``unshelve`` ã³ãã³ãã§\ æ»ãã¾ã:: $ bzr unshelve Unshelving changes with id "1". M description.txt All changes applied successfully. ããæãã®ã§ããã°ãè¤æ°ã®ã¢ã¤ãã ãshelfã«ç½®ããã¨ãã§ãã¾ãã é常 ``unshelve`` ãå®è¡ããããã³ã«æãæè¿ shelve ãããå¤æ´ã\ å ã«æ»ããã¾ãã æ示çã«ã©ã®å¤æ´ãæ»ãã®ããæå®ãããã¨ã§å¥ã®é åºã§ unshelve ãã\ ãã¨ãã§ãã¾ãã Bazaarã¯shelveãããå¾ã«å¤æ´ããã£ã¦ããshelfã®å¤æ´ãä½æ¥ããªã¼ã«\ ãã¼ã¸ããã®ã§ãè¡çªãçºçããããããã¾ããã ãã®å ´åã¯é常ã®ãã¼ã¸å¾ã¨åãããã«è¡çªã解決ããªããã°ãªãã¾ããã