APAR NUMBER:  PJ29364
PRODUCT:  Merge Tool
FUNCTIONAL AREA:  TPF MERGE TOOL
SHIPPED IN PUT:

ABSTRACT:
With APAR PJ28486 applied, when the TPF Merge Tool exits the merge
result session, the number of unresolved conflicts in the warning
message may not be accurate.

APAR CONTENTS:
FEATURE   TYPE                STATUS    NAME
merge     Object              Changed   ibm/tpf/tpfmerge/MakeViews.class

PREREQUISITE APARS:  To be applied in order listed.
merge     Object              Changed   ibm/tpf/tpfmerge/MakeViews.class
 PJ27381(13)  PJ27722(14)

COMMENTS:
With APAR PJ28486 applied, the TPF Merge Tool issues a warning message
if all conflicts are not resolved. 
Internally, the TPF Merge Tool maintains an undo list, which keeps
track of the user selections to the conflicts. When the TPF Merge Tool
exits, it utilizes the undo list to evaluate all user selections in the
undo list to determine which conflicts are resolved, and which are not.
However, the undo list has a maximum size of 50. It maintains only the
latest 50 selections. When the undo list overflows, the TPF Merge Tool
deletes the earliest entry to make room for a new entry. Therefore,
some user selections can be lost. This results in an inaccurate count
on the number of unresolved conflicts shown in the warning message.

SOLUTION:
The undo list is now updated to increase in size as needed without any
size limit. Therefore, when the TPF Merge Tool exits, it can evaluate
all user selections and issue a warning with the correct number of
unresolved conflicts.


DEPENDENCIES

SEGMENTS TO BE ASSEMBLED OR COMPILED:
None.

SEGMENTS TO BE LINK EDITED:
None.

COREQS:
None.

MIGRATION CONSIDERATIONS:
The self-extracting executable for this fix is available through the 
TPF Merge Tool Web page. Download the fix, double-click the executable,

and then specify the path that has the TPF Merge Tool installed. The 
executable will replace the necessary files in the appropriate 
directories.

DOWNLOAD INSTRUCTIONS:
http://www.ibm.com/software/htp/tpf/pages/maint.htm


Click on Link(s) to Download File(s)

PJ29364.exe