accept example

accept example.

Examples

C:\local-workspaces\HelloJazz>lscm status -C -w
Workspace: (1516) "Test2" <-> (1515) "Stream1"
  Component: (1535) "accept1 Default Component"
  Baseline: (1536) 12 "ellaTest12SS"
  Outgoing:
    Change sets:
      (2300) --!-$  "No comment" Jul 8, 2014 12:38:59 PM
        Changes:
          !--c- \2\2a.txt
  Incoming:
    Change sets:
      (1537) --!-$  "No comment" Jul 8, 2014 12:33:39 PM
        Changes:
          !--c- \2\2a.txt
  

Change set 2300 has a conflict with the incoming change set 1537. Accept the change set with --no-merge to disable auto merging of the change sets.

C:\local-workspaces\HelloJazz2>lscm accept 1537 --no-merge
Repository: https://ella.ottawa.ibm.com:9443/jazz/
Workspace: (2295) "Test2"
  Component: (1535) "accept1 Default Component"
    Change sets:
      (1537) ---#$  "No comment" Jul 8, 2014 12:33:39 PM
        Changes:
          -#-c- \2\2a.txt

The accept1 workspace still has conflicts after the accept operation completes. You can run lscm resolve conflict to resolve the conflict. You can also run lscm show conflicts or lscm show status for more information about the conflict.

Accepting incoming change sets from outside of a sandbox location.

C:\local-workspaces\HelloJazz>lscm status -C -w
Workspace: (1516) "Test2" <-> (1515) "Stream1"
  Component: (1535) "accept1 Default Component"
    Baseline: (1536) 12 "ellaTest12SS"
    Incoming:
      Change sets:
        (2327) -*--@  "Merges" Jul 8, 2014 4:38:33 PM
          Changes:
            ---c- \2\2b.txt
        (2326) ----$  "No comment" Jul 8, 2014 4:36:41 PM
          Changes:
            ---c- \2\2b.txt

Accept the change sets 2327 and 2326 from outside of the sandbox C:\local-workspaces\HelloJazz by using the -d option.

c:\>lscm accept 2327 2326 -d C:\local-workspaces\HelloJazz
Repository: https://ella.ottawa.ibm.com:9443/jazz/
Workspace: (2295) "accept1"
  Component: (1535) "accept1 Default Component"
    Change sets:
      (2326) ----$  "No comment" Jul 8, 2014 4:36:41 PM
        Changes:
          ---c- \2\2b.txt
      (2327) ----$  "Merges" Jul 8, 2014 4:44:40 PM
        Changes:
          ---c- \2\2b.txt

C:\local-workspaces\HelloJazz>lscm status -C -w
Workspace: (1516) "Test2" <-> (1515) "Stream1"
  Component: (1535) "accept1 Default Component"
  Baseline: (1536) 12 "ellaTest12SS"
  Outgoing:
    Change sets:
      (2300) --!-$  "No comment" Jul 8, 2014 12:38:59 PM
        Changes:
          ---c- \2\2a.txt

C:\local-workspaces\HelloJazz>lscm accept 2300
Accepting changes:
Repository: https://ella.ottawa.ibm.com:9443/jazz/
Workspace: (2295) "accept1"
  Component: (1535) "accept1 Default Component"
    Change sets:
      (2300) --!-$  "No comment" Jul 8, 2014 12:38:59 PM
        Changes:
          ---c- \2\2a.txt
Accept Command completed successfully.


video icon Video

Jazz.net channel
Software Education channel

learn icon Courses

IoT Academy
Skills Gateway

ask icon Community

Jazz.net
Jazz.net forums
Jazz.net library

support icon Support

IBM Support Community
Deployment wiki