å¤æ´ãã¬ãã¥ã¼ãã ================== ãªã¼ãããåã«ããã¯ãã ------------------------- ä½æ¥ãå®äºããããæä¹ çã«è¨é²ãããã¨ã«å é§ãã¦å¤æ´ãã¬ãã¥ã¼ããã®ã¯ããèãã§ãã ãã®æ¹æ³ã§ãä½ãæå³ãã¦ããã®ããã³ããããããã¨ã確èªã§ãã¾ãã 2ã¤ã®bzrã³ãã³ã: **status** 㨠**diff** ã¯ã¨ããã便å©ã§ãã bzr status ---------- **status** ã³ãã³ãã¯æå¾ã®ãªãã¸ã§ã³ä»¥éã«ä½æ¥ãã£ã¬ã¯ããªã«è¡ãããå¤æ´å 容ãä¼ãã¾ã:: % bzr status modified: foo ``bzr status`` 㯠å¤æ´ãããªããããã¯ç¡è¦ããã "ã¤ã¾ããªã" ãã¡ã¤ã«ãé ãã¾ãã statusã³ãã³ãã¯ãã§ãã¯ããããã«ãªãã·ã§ã³ã¨ãã¦ãã¡ã¤ã«ãããã¯ãã£ã¬ã¯ããªã®ååã渡ããã¨ãã§ãã¾ãã bzr diff -------- The **diff** ã³ãã³ãã¯ãã¹ã¦ã®ãã¡ã¤ã«ã¸ã®å¤æ´ã®å ¨æãæ¨æºã®unified diffã¨ãã¦è¡¨ç¤ºãã¾ãã ãã㯠''patch''ã ''diffstat''ã ''filterdiff'' 㨠''colordiff''ã¨ãã£ãå¤ãã®ããã°ã©ã ãéãã¦ãã¤ãã§å¼ã渡ããã¨ãã§ãã¾ã:: % bzr diff === added file 'hello.txt' --- hello.txt 1970-01-01 00:00:00 +0000 +++ hello.txt 2005-10-18 14:23:29 +0000 @@ -0,0 +1,1 @@ +hello world ``-r`` ãªãã·ã§ã³ã«ãã£ã¦ãããªã¼ã¯åã®ãªãã¸ã§ã³ããããã¯ç¤ºããã2ã¤ã®ãªãã¸ã§ã³ã®éãã表示ãã¾ã:: % bzr diff -r 1000.. # r1000 ããã®å ¨ã¦ã®å¤æ´ % bzr diff -r 1000..1100 # 1000 ãã 1100 ã¾ã§ã®å¤æ´ 1ã¤ã®ãªãã¸ã§ã³ã®å¤æ´ã ããè¦ããå ´åã¯ã ``-c`` ãªãã·ã§ã³ãå©ç¨ãã¾ãã :: % bzr diff -c 1000 # r1000 ã«ããå¤æ´ # -r999..1000 ã¨åãæå³ ``--diff-options`` ãªãã·ã§ã³ã«ãã£ã¦bzrã¯å¤é¨ã®diffããã°ã©ã ã«ãªãã·ã§ã³ã渡ãã¦å®è¡ãã¾ããä¾ã§ã:: % bzr diff --diff-options --side-by-side foo ããã¸ã§ã¯ãã®ä¸ã«ã¯æ°æ§ã®ãã¡ã¤ã«ã®ããã®ãã¹ã®å§ãã§æ¥é è¾ã表示ããããã«ãããã好ãã¨ãããããã¾ãã ``--prefix`` ãªãã·ã§ã³ã¯ãã®ãããªæ¥é è¾ãæä¾ããããã«ä½¿ããã¾ãã ã·ã§ã¼ãã«ããã¨ãã¦ã ``bzr diff -p1`` 㯠``patch -p1`` ã³ãã³ãã§æ©è½ããå½¢å¼ãçã¿åºãã¾ãã