比較檔案的兩個狀態。
scm diff 次指令會比較稱為 before 狀態和 after 狀態的兩個檔案狀態,且會選擇性產生表現差異的 Jazz™ Source Control 修補程式。 狀態是藉由提供兩個參數來指定:類型名稱和指名類型所適用的選取元。 必須指定 after 狀態。before 狀態是選用的(如果省略,便會從 after 狀態衍生)。
scm diff { [ -d | --dir ] workspace-path [ -p | --fullpatch ] } aftertype afterselector { beforetype beforeselector }
scm diff { [ -u | --username ] 儲存庫中的使用者 ID [ -P | --password ] password for user ID in repository [ -d | --dir ] workspace-path [ -p | --fullpatch ] } aftertype afterselector { beforetype beforeselector }
C:\local-workspaces\HelloJazz>scm status -C
工作區:(1101) "HelloJazz" <-> (1102) "HelloJazz Stream"
元件:(1103) "HelloJazz"
基準線:(1108) 3 "beta2 updates"
衝突:
com.example.hellojazz.service/src/com/example/hellojazz/service/internal/>
送出:
變更集:
(1115) !-@ <No comment>
變更:
!--c /com.example.hellojazz.service/src/com/example/hellojazz/servi>
C:\local-workspaces\HelloJazz>scm conflicts
衝突
C-m- /com.example.hellojazz.service/src/com/example/hellojazz/service/internal/HelloJazzService.java
執行 'conflicts' 時發生問題:
保留尚未解決的衝突。
C:\local-workspaces\HelloJazz>scm diff file com.example.hellojazz.service\src\com\example\hellojazz\service\internal\HelloJazzService.java stream 1102
--- com.example.hellojazz.service/src/com/example/hellojazz/service/internal/HelloJazzService.java 2008-06-03 09:17:36.000000723 -0400
+++ com.example.hellojazz.service/src/com/example/hellojazz/service/internal/HelloJazzService.java 2008-06-03 09:12:27.000000563 -0400
@@ -17,6 +17,6 @@
implements IHelloJazzService {
public String sayHello() throws TeamRepositoryException {
- return "Hello Jazz! You're looking good!";
+ return "Hello Jazz! How are you?";
}
}