set merge-queue example
set merge-queue example
Examples
C:\jazz\testCLI>scm show status
Workspace: (3007) "HEAD" <-> (3009) "HEAD"
Component: (3010) "Component1"
Baseline: (3011) 1 "Initial Baseline"
Current Merge:
Source: (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-N>
Target: (3021) >---@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov>
Merge Queue:
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
Outgoing:
Change sets:
(3021) >*--@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov-2015 >
Incoming:
Change sets:
(3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-Nov-201>
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
(3013) ----$ TestJazzUser1 "Add b.txt" 05-Nov-2015 01:23 PM
Workspace: (3007) "HEAD" <-> (3009) "HEAD"
Component: (3010) "Component1"
Baseline: (3011) 1 "Initial Baseline"
Current Merge:
Source: (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-N>
Target: (3021) >---@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov>
Merge Queue:
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
Outgoing:
Change sets:
(3021) >*--@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov-2015 >
Incoming:
Change sets:
(3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-Nov-201>
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
(3013) ----$ TestJazzUser1 "Add b.txt" 05-Nov-2015 01:23 PM
C:\jazz\testCLI>scm set merge-queue -w 3007 --add 3012 -- 3010
Added change sets to merge queue successfully
Added change sets to merge queue successfully
C:\jazz\testCLI>scm show status
Workspace: (3007) "HEAD" <-> (3009) "HEAD"
Component: (3010) "Component1"
Baseline: (3011) 1 "Initial Baseline"
Current Merge:
Source: (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-N>
Target: (3021) >---@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov>
Merge Queue:
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
Outgoing:
Change sets:
(3021) >*--@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov-2015 >
Incoming:
Change sets:
(3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-Nov-201>
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
(3013) ----$ TestJazzUser1 "Add b.txt" 05-Nov-2015 01:23 PM
Workspace: (3007) "HEAD" <-> (3009) "HEAD"
Component: (3010) "Component1"
Baseline: (3011) 1 "Initial Baseline"
Current Merge:
Source: (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-N>
Target: (3021) >---@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov>
Merge Queue:
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
Outgoing:
Change sets:
(3021) >*--@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov-2015 >
Incoming:
Change sets:
(3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-Nov-201>
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
(3013) ----$ TestJazzUser1 "Add b.txt" 05-Nov-2015 01:23 PM
C:\jazz\testCLI>scm set merge-queue -w 3007 -o 3017 -- 3010
Reordered change sets in the merge queue successfully.
Reordered change sets in the merge queue successfully.
C:\jazz\testCLI>scm show status
Workspace: (3007) "HEAD" <-> (3009) "HEAD"
Component: (3010) "Component1"
Baseline: (3011) 1 "Initial Baseline"
Current Merge:
Source: (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-N>
Target: (3021) >---@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov>
Merge Queue:
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
Outgoing:
Change sets:
(3021) >*--@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov-2015 >
Incoming:
Change sets:
(3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-Nov-201>
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
(3013) ----$ TestJazzUser1 "Add b.txt" 05-Nov-2015 01:23 PM
Workspace: (3007) "HEAD" <-> (3009) "HEAD"
Component: (3010) "Component1"
Baseline: (3011) 1 "Initial Baseline"
Current Merge:
Source: (3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-N>
Target: (3021) >---@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov>
Merge Queue:
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
Outgoing:
Change sets:
(3021) >*--@ "Merge of 'Make changes to b.txt and c.txt'" 05-Nov-2015 >
Incoming:
Change sets:
(3016) ----$ TestJazzUser1 "Make changes to b.txt and c.txt" 05-Nov-201>
(3017) ----$ TestJazzUser1 "Add c.txt" 05-Nov-2015 01:36 PM
(3012) ----$ TestJazzUser1 "Add new line in b" 05-Nov-2015 01:24 PM
(3013) ----$ TestJazzUser1 "Add b.txt" 05-Nov-2015 01:23 PM