undo merge example

undo merge example

Examples

Scenario

Workspace Head has HeadStream as flowtarget and HeadComponent as component. HeadComponent has two changesets CS1 (suspended) and CS2. Both are completed changesets. Both CS1 and CS2 have file1.txt and file2.txt where file2.txt is auto-resolvable when there is conflict.

[user@localhost sandbox]$ scm show status
Workspace: (1000) "Head" <-> (1001) "HeadStream"
  Component: (1002) "HeadComponent"
    Baseline: *(1003) 1 "Initial Baseline"
    Outgoing:
      Change sets:
        (1004) ----$  "CS2" 24-Oct-2017 07:43 PM
    Suspended:
      Change sets:
        (1005) ----$  "CS1" 24-Oct-2017 07:35 PM

Resume the suspended changeset, i.e., CS1

[user@localhost sandbox]$ scm resume cs 1005
Resuming change sets:
  Repository: https://ella.ottawa.ibm.com:9443/jazz/
  Workspace: (1000) "Head"
    Component: (1002) "HeadComponent"
      Change sets:
        (1005) ---#$  "CS1" 24-Oct-2017 07:35 PM
          Changes:
            -#-c- /ProjectX/file1.txt
            ---c- /ProjectX/file2.txt

Problem running 'resume changeset': Conflicts in workspace after resume. Run 'scm resolve conflict' or 'scm show conflicts' or 'scm show status' for help in resolving the conflicts.

Status after resuming CS1

Observe that changeset 'Merges' has been created which has file2.txt which is auto resolvable. Also, observe that file1.txt can't be auto resolvable and should be resolved manually.

[user@localhost sandbox]$ scm show status
Workspace: (1000) "Head" <-> (1001) "HeadStream"
  Component: (1002) "HeadComponent"
    Baseline: *(1003) 1 "Initial Baseline"
    Conflicts:
      Cc- (1006) /ProjectX/file1.txt (Modified <-> Modified)
    Outgoing:
      Change sets:
        (1007) -*--@  "Merges" 24-Oct-2017 07:57 PM
        (1005) ----$  "CS1" 24-Oct-2017 07:35 PM
        (1004) ----$  "CS2" 24-Oct-2017 07:43 PM

Resolve file1.txt with proposed change

[rajeev@localhost testing]$ scm resolve conflict -p 1006
Conflicted items have been successfully resolved.

Status after resolving conflict

Observe that file1.txt is no more a conflicted file.

[rajeev@localhost testing]$ scm show status
Workspace: (1000) "Head" <-> (1001) "HeadStream"
  Component: (1002) "HeadComponent"
    Baseline: *(1003) 1 "Initial Baseline"
    Outgoing:
      Change sets:
        (1007) -*--@  "Merges" 24-Oct-2017 08:03 PM
        (1005) ----$  "CS1" 24-Oct-2017 07:35 PM
        (1004) ----$  "CS2" 24-Oct-2017 07:43 PM

Undo the merge on file1.txt

[rajeev@localhost testing]$ scm undo merge 1006
Merges successfully undone

Status after 'undo merge'

Observe that file1.txt is in conflict state. Same state as in step 2 here.

[rajeev@localhost testing]$ scm show statusWorkspace: (1000) "Head" <-> (1001) "HeadStream"
  Component: (1002) "HeadComponent"
    Baseline: *(1003) 1 "Initial Baseline"
    Conflicts:
      Cc- (1006) /ProjectX/file1.txt (Modified <-> Modified)
    Outgoing:
      Change sets:
        (1007) -*--@  "Merges" 24-Oct-2017 08:06 PM
        (1005) ----$  "CS1" 24-Oct-2017 07:35 PM
        (1004) ----$  "CS2" 24-Oct-2017 07:43 PM