Using the merge-queue command when accepting change sets with gaps

You can use the merge-queue command when accepting change sets with gaps.

Examples

scm status
Workspace: (1000) "accept1" <-> (1001) "abcStream1"
  Component: (1012) "accept1 Default Component"
    Baseline: (1013) 12 "ellaTest12SS"
    Current Merge:
      Source: (1026) ----$  "No comment" 09-Jul-2014
      Target: (1462) >---@  "Merges" 31-Oct-2014
    Outgoing:
      Change sets:
        (1270) ----$  "No comment" 06-Oct-2014
        (1269) ----$  "No comment" 06-Oct-2014
        (1014) ----$  "No comment" 28-Aug-2014
        (1015) ----$  "No comment" 28-Aug-2014    
    Incoming:
      Change sets:
        (1018) ----$  "No comment" 22-Aug-2014
        (1020) ----$  "No comment" 21-Aug-2014
(1026) ----$  "No comment" 27-Aug-2014
        (1027) ----$  "No comment" 27-Aug-2014

Accepting a change set without accepting all the changes which led to it would cause a gap.

scm accept 1026
Problem running 'accept':
Missing change sets found.
The change sets that you are accepting are built on change sets that are not in your repository workspace.
Either accept all change sets using the "accept-missing-changesets"
option or use the "queue-merges" option to begin merging.

Use the "list missing-changesets" command to list the missing change sets and see the additional changes.
Use the --accept-missing-changesets option to accept the missing change sets along with the change sets specified.
Use the --queue-merges option to begin merging only the change sets specified.

This could be done using the --queue-merges.

scm accept 1026 --queue-merges
Accepting changes:
Repository: https://ella.ottawa.ibm.com:9443/jazz/
Workspace: (1000) "accept1"
  Component: (1012) "accept1 Default Component"
    Current Merge:
      (1026) ----$ Shashikant Padur "No comment" 09-Jul-2014
      Changes:
        -Gm (1426) /2/2c.txt
          -C- (1461) Content modified
    Change sets:
      (1026) ----$  "No comment" 09-Jul-2014
        Changes:
          ---c- \2\2c.txt
Following components have change sets that require merge after accept:
  accept1 - accept1 Default Component
Run 'scm resolve current-merge' or 'scm set current-merge' or 'scm list merge-queue' or 'scm show status' to work with the merge queue.
Accept command completed successfully.

List merge-queue and resolve current-merge.

scm accept -C 1012 -q
Accepting changes:
Repository: https://ella.ottawa.ibm.com:9443/jazz/
Workspace: (1000) "accept1"
  Component: (1012) "accept1 Default Component"
    Current Merge:
      (1026) ----$ Shashikant Padur "No comment" 09-Jul-2014
      Changes:
        -Gm (1426) /2/2c.txt
          -C- (1461) Content modified
    Change sets:
      (1022) ----$  "No comment" 14-Aug-2014
        Changes:
          ---c- \2\2c.txt
          ---c- \2\2d.txt
      (1024) ----$  "No comment" 14-Aug-2014
        Changes:
          ---c- \2\2c.txt
          --a-- \2\2d.txt
      (1027) ----$  "No comment" 09-Jul-2014
        Changes:
          ---c- \2\2c.txt
      (1026) ----$  "No comment" 09-Jul-2014
        Changes:
          ---c- \2\2c.txt
      (1025) ----$  "No comment" 09-Jul-2014
        Changes:
          ---c- \2\2c.txt
      (1018) ----$  "No comment" 22-Aug-2014
        Changes:
          ---c- \10\10.txt
      (1020) ----$  "No comment" 21-Aug-2014
      (1021) ----$  "No comment" 09-Jul-2014
        Changes:
          ---c- \2\2c.txt
        Work items:
          (1144) 6861 "Test deliver WI"
      (1023) ----$  "No comment" 14-Aug-2014
        Changes:
          ---c- \2\2c.txt
          ---c- \2\2d.txt
Following components have change sets that require merge after accept:
  accept1 - accept1 Default Component
Run 'scm resolve current-merge' or 'scm set current-merge' or 'scm list merge-queue' or 'scm show status' to work with the merge queue.
Accept command completed successfully.

scm ls merge-queue -w 1000 1012
Current Merge:
  (1026) ----$ Shashikant Padur "No comment" 09-Jul-2014
  Changes:
    -Gm (1426) /2/2c.txt
      -C- (1461) Content modified
Merge Queue:
  (1028) ----$ Shashikant Padur "No comment" 10-Jul-2014
  (1027) ----$ Shashikant Padur "No comment" 09-Jul-2014
  (1025) ----$ Shashikant Padur "No comment" 09-Jul-2014
  (1024) ----$ Shashikant Padur "No comment" 14-Aug-2014
  (1023) ----$ Shashikant Padur "No comment" 14-Aug-2014
  (1022) ----$ Shashikant Padur "No comment" 14-Aug-2014
  (1021) ----$ Shashikant Padur 6861 "Test deliver WI" - "No comment" 09-Jul->
  (1020) ----$ Shashikant Padur "No comment" 21-Aug-2014
  (1018) ----$ Shashikant Padur "No comment" 22-Aug-2014

scm resolve cm -w 1000  -c 1426 -- 1012
Some of the changes could not be auto-resolved. You will have to merge them manually.  

Resolve the current merge with the checked in changes.

scm resolve cm -w 1000 -c 1426 -m -- 1012
All changes in the current merge are resolved. Run the 'scm resolve current-merge --complete' command to mark it complete.

The currently merged change set 1426 now appears in the outgoing list.

scm status
Workspace: (1000) "accept1" <-> (1001) "abcStream1"
  Component: (1012) "accept1 Default Component"
    Baseline: (1013) 12 "ellaTest12SS"
    Current Merge:
      Source: (1026) ----$  "No comment" 09-Jul-2014
      Target: (1462) >---@  "Merges" 31-Oct-2014
    Merge Queue:
      (1028) ----$  "No comment" 10-Jul-2014
      (1027) ----$  "No comment" 09-Jul-2014
      (1025) ----$  "No comment" 09-Jul-2014
      (1024) ----$  "No comment" 14-Aug-2014
      (1023) ----$  "No comment" 14-Aug-2014
      (1022) ----$  "No comment" 14-Aug-2014
      (1021) ----$  6861 "Test deliver WI" - "No comment" 09-Jul-2014
      (1020) ----$  "No comment" 21-Aug-2014
      (1018) ----$  "No comment" 22-Aug-2014
    Outgoing:
      Change sets:
        (1462) >*--@  "Merges" 31-Oct-2014
        (1463) ----@  "Merges" 31-Oct-2014


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