APAR NUMBER:  PJ29831                         
PRODUCT:  Merge Tool
SHIPPED IN PUT:  
 

ABSTRACT:
TPF Merge Tool may miss differences or conflicts that should be applied
to the output file with automerge option set, or append an extraneous
"null" word at the end of a merged output file.
 
APAR CONTENTS:
FEATURE   TYPE                STATUS    NAME                              
merge     Object              Changed   ibm/tpf/automerge/ResolveDiffs.class
merge     Object              Changed   ibm/tpf/tpfmerge/Diffn.class
 
PREREQUISITE APARS:  To be applied in order listed.
merge     Object              Changed   ibm/tpf/automerge/ResolveDiffs.class
 PJ27381(13)  PJ27722(14)  PJ28032(15)  PJ28305()  
merge     Object              Changed   ibm/tpf/tpfmerge/Diffn.class
 PJ27381(13)  PJ27722(14)  PJ28166(16)  
 

COMMENTS:
When running TPF Merge Tool on a 3-way merge, if the differences occur
at the end of the input file 2, TPF Merge Tool may miss the differences
and it does not apply the differences to the output file when the
automerge option is selected. This is caused by the design that TPF
Merge Tool uses file 3 as the base for the output file. If the base
file has been completely written out to the output file, it ignores any
further differences and conflicts from the other files.
Also, when reading a line in from the base output file, the line read
may be an empty string if TPF Merge Tool has reached the end of the
file. While writing the line to the output file, it fails to check to
see if the line being read is empty. As a result, a string "null" may
appear at the end of the output file when an empty line is written.
 

SOLUTION:
TPF Merge Tool is updated to process all the remaining differences or
conflict after the base output file has been written out. Also, a check
is added to prevent "null" string being written to the output file.
 
 

DEPENDENCIES
 
SEGMENTS TO BE ASSEMBLED OR COMPILED:
None.
 
SEGMENTS TO BE LINK EDITED:
None.
 
COREQS:
None.
 

MIGRATION CONSIDERATIONS:
None.
 
UPDATED INFORMATION UNITS:
None.
 
See your IBM representative if you need additional information.
 

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


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

PJ29831.exe