Defect with Diff3 utility

[Rahul Nerlikar]

Hi,

 

Could anyone shed some light on this peculiarity of the diff3 utility?

 

Here’s the example OLDFile is as below,

 

#ENGLISH Resource File

 

#DoNotTranslate

L6_WINDOWS = OK|O

# fail to enable path.

set_pathEnabled_failed = Failed to enable the path.

# fail to set preferred path.

set_preferredPath_failed = Failed to set preferred path.

set_primaryPath_failed = Failed to set primary path.

# fail to purge disk

set_purgeDisk_failed = Failed to purge disks.

# set Array status failed.

set_arrayStatus_failed = Failed to set array status.

 

# please wait message

msg_wait_for_system_update = The system is currently too busy to update the 
device status.  Please try the operation later.

 

# hard_disk_name

hard_disk_name=Harddisk

 

#Top Menu Item that displays short cut. In Japanese, Korea... , add (P) at the 
end.

top_path_menu = Path|P

 

 

New file is as below,

 

#ENGLISH Resource File

 

#DoNotTranslate

L6_WINDOWS = OK|O

#EndDoNotTranslate

 

# labels for the DMP client extension

NONE_ID = None

ACTIVE_ACTIVE_ID = Active/Active|A

ACTIVE_PASSIVE_ID = Active/Passive|P

NAME_ID = Array Name:

OK_ID = OK|O

# fail to enable path.

set_pathEnabled_failed = Failed to enable the path.

# fail to set preferred path.

set_preferredPath_failed = Failed to set preferred path.

set_primaryPath_failed = Failed to set primary path.

# fail to purge disk

set_purgeDisk_failed = Failed to purge disks.

# set Array status failed.

set_arrayStatus_failed = Failed to set array status.

 

# please wait message

msg_wait_for_system_update = The system is currently too busy to update the 
device status.  Please try the operation later.

 

# hard_disk_name

hard_disk_name=Harddisk

 

#Top Menu Item that displays short cut. In Japanese, Korea... , add (P) at the 
end.

top_path_menu = Path|P

 

ARRAY_GROUP_NODES = Arrays

>>>>>>>>Note there is only a single CR at the end of this file and this 
>>>>>>>>statement is not part of the file.

 

YOURFILE is 

 

#JAPANESE Resource File

 

#DoNotTranslate

L6_WINDOWS = OK|O

#EndDoNotTranslate

 

# labels for the DMP client extension

NONE_ID = なし

ACTIVE_ACTIVE_ID = アクティブ×アクティブ|A

ACTIVE_PASSIVE_ID = アクティブ×パッシブ|P

NAME_ID = アレイ名: 

OK_ID = 了解|O

# fail to enable path.

set_pathEnabled_failed = パスの有効化に失敗しました。

# fail to set preferred path.

set_preferredPath_failed = 優先パスの設定に失敗しました。

set_primaryPath_failed = プライマリ パスを設定できませんでした。

# fail to purge disk

set_purgeDisk_failed = ディスクの消去に失敗しました。

# set Array status failed.

set_arrayStatus_failed = アレイの設定に失敗しました。

 

# please wait message

msg_wait_for_system_update = システムがビジーなため、デバイス状態を更新できませんでした。あとでもう一度実行してください。

 

# hard_disk_name

hard_disk_name=ハードディスク

 

#Top Menu Item that displays short cut. In Japanese, Korea... , add (P) at the 
end.

top_path_menu = パス(P)|P

 

 

After the following command 

diff3 -m -L New newfile.txt -L Old oldfile.txt -L JPN yourfile.txt > 
mergedfile.txt

I receive the following output,

This is the merged file

 

#JAPANESE Resource File

 

#DoNotTranslate

L6_WINDOWS = OK|O

<<<<<<< New

#EndDoNotTranslate

 

# labels for the DMP client extension

NONE_ID = None

ACTIVE_ACTIVE_ID = Active/Active|A

ACTIVE_PASSIVE_ID = Active/Passive|P

NAME_ID = Array Name:

OK_ID = OK|O

||||||| Old

=======

#EndDoNotTranslate

 

# labels for the DMP client extension

NONE_ID = ??

ACTIVE_ACTIVE_ID = ?????×?????|A

ACTIVE_PASSIVE_ID = ?????×????|P

NAME_ID = ????: 

OK_ID = ??|O

>>>>>>> JPN

# fail to enable path.

set_pathEnabled_failed = ??????????????

# fail to set preferred path.

set_preferredPath_failed = ???????????????

set_primaryPath_failed = ????? ??????????????

# fail to purge disk

set_purgeDisk_failed = ???????????????

# set Array status failed.

set_arrayStatus_failed = ??????????????

 

# please wait message

msg_wait_for_system_update = ??????????????????????????????????????????????

 

# hard_disk_name

hard_disk_name=???????

 

#Top Menu Item that displays short cut. In Japanese, Korea... , add (P) at the 
end.

<<<<<<< New

top_path_menu = Path|P

||||||| Old

top_path_menu = Path|P

 

=======

top_path_menu = ??(P)|P

 

>>>>>>> JPN

 

ARRAY_GROUP_NODES = Arrays

 

The defect is the last new line (marked in bold)in the new file is NOT marked 
appropriately. This defect is causing major merging issues as the new lines 
added at the end of the file remain ignored as they are not marked.

 

Any help is appreciated…this is causing major embarrassment as automation is 
imperfect.

 

Regards,

Rahul