Skip to content

Comparing and Merging Versions (Option 2)

To compare and merge versions, from the Member Reconciliation menu, select option 2 (EXECUTE). The base and derivative data set names are those that were previously specified on the Versions panel.

Since the base version is a single file or member, the Execute In Progress panel appears briefly, and M+R performs these actions behind this panel:

  • Loads the chosen base member and the derivatives (one by one) into storage.

  • Compares the base with each of the derivatives and records the differences.

  • Stores the base and the differences in the M+R merged versions file.

  • Identifies and combines the same changes in different versions and marks the conflicting and singular changes.

  • Calculates the Degree of Complexity of the reconciliation effort and inserts this information (as a comment) at the top of the merged versions file.

  • Displays a full view of the merged versions file for reconciliation.

The Execute in Progress panel is followed by the Reconcile panel, as shown below.

  • If the Include Prefix field on the Version Editing Options panel is NO, then the first line containing the timestamp and the base version DSNAME is followed by the merged versions code lines.

  • If the Include Prefix field on the Version Editing Options panel is YES, then an analysis table of the reconciliation like the following appears after that first line.

CDFPANEL ----------------------- RECONCILE ------------------ ROW 1 TO 20 OF 97 B:DRV1 C:DRV2  
******************************** TOP OF DATA **********************************
000000 ********/* 2001/04/05 17:03:43 somnode.CMNZMF.SAMPLES  
                  Records in Exported File:  
                 |-------------------------------------------------
                 |DEGREE OF COMPLEXITY: 4 MEDIUM 
                 |-------------------------------------------------  
                 |        RECORDS |  CONFLICTS |SINGLE CHANGES    |
                 |----------------|---------------|---------------|  
                 |NICKNAMES       |PREV CURR DIFF |PREV CURR DIFF | 
                 |----------------|---------------|---------------|  
                 |ORIGINAL     60 |        1   0% |        3   0% |  
                 |----------------|---------------|---------------|  
                 |DRV1         63 |        5   0% |        2   0% |  
                 |----------------|---------------|---------------|  
                 |DRV2         66 |        7   0% |        1   0% |  
                 |----------------|---------------|---------------|  
                 |RECONCIL        |        0   0% |        0   0% |  
                 |----------------|---------------|---------------|  
                 |         TOTAL: |       13   0% |        6   0% |  
                 |------------------------------------------------ 
                          Reconciliation Scope:

The panel above displays an initial analysis of the merged versions. It shows that the Degree of Reconciliation Complexity is 4, or Medium, on a scale of 1 through 10. It also indicates the following:

  • One record in base was changed by more than one derivative. A total of 12 records of DRV1 and DRV2 are in conflict; that is, they represent competing changes to 1 record in base.

  • The current release of base has 60 lines of code, 3 of which were changed independently by 2 records in DRV1 and by 1 record in DRV2. These are single changes.

For details about the analysis table, see Analyzing Changes.

The Degree of Complexity is followed by the Reconciliation Scope, similar to the following panel.

CDFPANEL -------------------- RECONCILE ------------------- ROW 21 TO 41 OF 97
 B:WALKTR#1 C:WALKTR#2
        NICKNAME  MEMBER     LAST MODIFIED     USER ID     DATA SET NAME
    --------------------------------------------------------------------------
        ORIGINAL  COBOLBAS   2000/10/29 17:48  CDF410B  somnode.CMNZMF.SAMPLES
        WALKTR#1  COBOLDV1   2000/10/29 17:40  CDF410B  somnode.CMNZMF.SAMPLES
        WALKTR#2  COBOLDV2   2000/10/29 17:40  CDF410B  somnode.CMNZMF.SAMPLES
        RECONCIL             2001/04/05 11:41  USER83   Current Work

    --------------------------------------------------------------------------
 000001 000100 IDENTIFICATION DIVISION.
 000002 000200 PROGRAM-ID. COBOL01.
 000003 000300 ENVIRONMENT DIVISION.

...