IBM Support

PI53197: BASE AWARE MERGE IGNORES CONFLICTING MERGE IN COMPONENT SCOPE

A fix is available

Subscribe

You can track all active APARs for this component.

 

APAR status

  • Closed as program error.

Error description

  • In the attachment you will find a project which contains three
    classes (A,B,C) and a component ("Cmp1") within package
    "Default".
    
    In the "base" version of the project all three classes "A", "B"
    and "C" are in the scope of "Cmp1".
    On the "left" side the scope of "Cmp1" is changed to contain
    only class "A".
    On the "right" side the scope of "Cmp1" is changed to contain
    only class "B".
    
    
    Now a merge operation happens. To simulate the merge you can use
    the attached "diffmerge.bat".
    DiffMerge will ask to "merge all trivial (non conflicting)
    differences". Say "yes".
    
    If you look at the result you will recognize, that DiffMerge has
    chosen the left side as result.
    DiffMerge does not detect any conflict. The changes done on the
    right side are lost.
    
    Expectation: The change of the scope on both sides ("left" and
    "right") should result in a conflict.
    
    DiffMerge merges automatically instead of detecting a conflict.
    The merge result is by accident correct or wrong.
    After the merge these problems have to be searched and resolved
    manually, which can be tedious in a large project.
    

Local fix

Problem summary

  • ****************************************************************
    * USERS AFFECTED:                                              *
    * Rhapsody 8.1.3                                               *
    ****************************************************************
    * PROBLEM DESCRIPTION:                                         *
    * BASE AWARE MERGE IGNORES CONFLICTING MERGE IN COMPONENT      *
    * SCOPE                                                        *
    ****************************************************************
    * RECOMMENDATION:                                              *
    ****************************************************************
    

Problem conclusion

  • Fixed in 8.1.5
    

Temporary fix

Comments

APAR Information

  • APAR number

    PI53197

  • Reported component name

    TLOGIC RHAPSODY

  • Reported component ID

    5724V74RP

  • Reported release

    812

  • Status

    CLOSED PER

  • PE

    NoPE

  • HIPER

    NoHIPER

  • Special Attention

    NoSpecatt / Xsystem

  • Submitted date

    2015-11-26

  • Closed date

    2016-04-25

  • Last modified date

    2016-04-25

  • APAR is sysrouted FROM one or more of the following:

  • APAR is sysrouted TO one or more of the following:

Fix information

  • Fixed component name

    TLOGIC RHAPSODY

  • Fixed component ID

    5724V74RP

Applicable component levels

  • R813 PSY

       UP

[{"Business Unit":{"code":"BU048","label":"IBM Software"},"Product":{"code":"SS7P9W","label":"Rational Rhapsody"},"Component":"","ARM Category":[],"Platform":[{"code":"PF025","label":"Platform Independent"}],"Version":"8.1.2","Edition":"","Line of Business":{"code":"","label":""}}]

Document Information

Modified date:
25 April 2016