question about UWC patch

Hi.

I'm installing the UWC patch 118540-42,

1.- i installed the patch

2.- i ran the command /opt/SUNWuwc/sbin/patch-config -d /var/opt/SUNWuwc /opt/SUNWuwc/install/patch/118540-42

but when i run

/opt/SUNWuwc/sbin/install-newconfig -d /var/opt/SUNWuwc /opt/SUNWuwc/install/patch/118540-42

i get the following error

=======

-- ERROR: /opt/SUNWuwc/install/patch/118540-42/save/WEB-INF/domain/uwcdomainconfig.proper ties.new has diff3 conflicts in it

--

-- 1 errors found, please correct and rerun the

-- utility. No change was made to the system.

Exiting with status=1 ...

does anybody know what could be the problem

-

Solaris 10

Messaging

Sun Java(tm) System Messaging Server 6.2-6.01 (built Apr 3 2006)

libimta.so 6.2-6.01 (built 11:20:35, Apr 3 2006)

[868 byte] By [mess_usera] at [2007-11-27 1:23:33]
# 1

i ran the following command

diff uwcdomainconfig.properties uwcdomainconfig.properties.new

> uwc-user-attr-icsBeginYear=<Begin_Year_LessThanOrEqualTo_Current_Year>

> uwc-user-attr-icsEndYear=<End_Year_GreaterThanOrEqualTo_Current_Year>

> #uwc-user-attr-recurrenceThreshold=<Threshold_configured_in_calendar_server& gt;

> uwc-user-attr-extendedDQuoteSupport=true

> uwc-user-attr-hideCalId=false

mess_usera at 2007-7-12 0:13:19 > top of Java-index,E-Mail, Calendar, & Collaboration,Sun Java System Messaging Server...
# 2

i ran the following command

diff uwcdomainconfig.properties uwcdomainconfig.properties.new

46a47

> <<<<<<< /opt/SUNWuwc/install/patch/118540-42/save/WEB-INF/domain/uwcdomainconfig.proper ties.new

48a50,53

> =======

> uwc-user-attr-icsExtendedUserPrefs-ceDefaultAlarmStart=P15M

> uwc-user-attr-icsExtendedUserPrefs-ceNotifyEnable=0

> >>>>>>> /opt/SUNWuwc/lib/config-templates/uwcdomainconfig.properties

49a55,59

> uwc-user-attr-icsBeginYear=<Begin_Year_LessThanOrEqualTo_Current_Year>

> uwc-user-attr-icsEndYear=<End_Year_GreaterThanOrEqualTo_Current_Year>

> #uwc-user-attr-recurrenceThreshold=<Threshold_configured_in_calendar_server& gt;

> uwc-user-attr-extendedDQuoteSupport=true

> uwc-user-attr-hideCalId=false

mess_usera at 2007-7-12 0:13:20 > top of Java-index,E-Mail, Calendar, & Collaboration,Sun Java System Messaging Server...
# 3

Actually, the error message is pretty plain:

-- ERROR: /opt/SUNWuwc/install/patch/118540-42/save/WEB-INF/domain/uwcdomainconfig.proper ties.new has diff3 conflicts in it

--

-- 1 errors found, please correct and rerun the

It's telling you that when it examined the config files, there appears to be an error in that comparison, and it's up to you to resolve it.

jay_plesseta at 2007-7-12 0:13:20 > top of Java-index,E-Mail, Calendar, & Collaboration,Sun Java System Messaging Server...
# 4
Look here near the bottom: http://forum.java.sun.com/thread.jspa?threadID=5122519&messageID=9516258. Not the same patch, but the explanation is pretty much the same.
nate.wheelera at 2007-7-12 0:13:20 > top of Java-index,E-Mail, Calendar, & Collaboration,Sun Java System Messaging Server...