The scm diff subcommand compares two states of a file, called the before state and the after state, and optionally produces a Rational Team Concert™ source control patch that expresses the difference. A state is specified by providing two parameters: a type name and a selector appropriate for the named type. The after state must be specified. The before state is optional (if omitted, it is derived from the after state).
scm diff { [ -d | --dir ] workspace-path [ -p | --fullpatch ] } aftertype afterselector { beforetype beforeselector }
scm diff { [ -u | --username ] user ID in repository [ -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
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?";
}
}
Did this help? You can provide feedback at Jazz.net (registration required): Comment in the forums or submit a bug