APAR NUMBER:  PJ28305
PRODUCT:  TPF4
FUNCTIONAL AREA:  TPF MERGE TOOL
SHIPPED IN PUT:

ABSTRACT:
Provide an option in TPF Merge Tool so users can specify not to create
output files that have unresolved conflicts during automerge.

APAR CONTENTS:
FEATURE   TYPE                STATUS    NAME
Base      Object              Changed   ibm/tpf/automerge/ResolveDiffs.class
Base      Object              Changed   ibm/tpf/tpfmerge/CommandLine.class
Base      Object              Changed   ibm/tpf/tpfmerge/MergeOptions.class
Base      Object              Changed   ibm/tpf/tpfmerge/MergeParms.class
Base      Object              Changed   ibm/tpf/tpfmerge/TPFMerge*.class



PREREQUISITE APARS:  To be applied in order listed.
Base      Object              Changed   ibm/tpf/automerge/ResolveDiffs.class
 PJ27381(13)  PJ27722(14)  PJ28032(15)
Base      Object              Changed   ibm/tpf/tpfmerge/CommandLine.class
 PJ27381(13)  PJ27722(14)  PJ28112(16)
Base      Object              Changed   ibm/tpf/tpfmerge/MergeOptions.class
 PJ27381(13)  PJ27722(14)  PJ28112(16)
Base      Object              Changed   ibm/tpf/tpfmerge/MergeParms.class
 PJ27381(13)  PJ27722(14)  PJ28112(16)
Base      Object              Changed   ibm/tpf/tpfmerge/TPFMerge*.class
 PJ27381(13)  PJ27722(14)  PJ28112(16)  PJ28086(16)


COMMENTS:
When executing automerge, all output files are being generated in the
specified output directory. Output files are created even if the files
contain unresolved conflicts that require further user actions. Users
have to look into the log file to determine which output files are
successfully merged, and which files contain unresolved conflicts.

SOLUTION:
An "ignore" option is provided at the command line prompt for the
"-conflictresolution" parameter, as well as at the Automerge pull-down
menu in the Merge Option GUI. When executing automerge with the ignore
option, files with conflicts will not be written to the output.


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

BUILD INSTRUCTIONS:
None.

TEST INSTRUCTIONS:
None.


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


PJ28305.exe