scm conflicts サブコマンドは、ワークスペース内にある未解決の競合を表示します。提案された変更や、行った変更も表示することができます。
scm conflicts [ -r | --repository-uri ] repository URI or nickname { [ -d | --dir ] workspace-path [ [ -q | --quiet ] | [ -v | --verbose ] ] } [ [ -m | --mine ] | [ -p | --proposed ] ]
scm conflicts [ -r | --repository-uri ] repository URI [ -u | --username ] user ID in repository [ -P | --password ] password for user ID in repository { [ -d | --dir ] workspace-path [ [ -q | --quiet ] | [ -v | --verbose ] ] } [ [ -m | --mine ] | [ -p | --proposed ] ]
C:¥local-workspaces¥HelloJazz>scm status -C
Workspace: (1101) "HelloJazz" <-> (1102) "HelloJazz Stream"
Component: (1103) "HelloJazz"
Baseline: (1108) 3 "beta2 updates"
Conflicts:
com.example.hellojazz.service/src/com/example/hellojazz/service/internal/>
Outgoing:
Change sets:
(1115) !-@ <No comment>
Changes:
!--c /com.example.hellojazz.service/src/com/example/hellojazz/servi>
C:¥local-workspaces¥HelloJazz>scm conflicts
Conflicts
C-m- /com.example.hellojazz.service/src/com/example/hellojazz/service/internal/HelloJazzService.java
Problem running 'conflicts':
Unresolved conflicts remain.
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?";
}
}
この情報はお役に立ちましたか? Jazz.net でフィードバックをお送り頂けます (登録が必要です): フォーラムにコメントを記入したり、バグを送信したりすることができます。