[OpenCM] Problem in merging of files

[Sipp, Bob]

Mohan,

jar files are binary, so you aren't able to merge them with the default merge tool, which is designed to merge ascii files.  If you need to merge the lines of code you will need to create a jar from the merged code, checked out the jar file from one of the code lines, check in the new jar file, and then create a link from the parallel version to the new version.

Bob Sipp
CM Team
Bank of America

-----Original Message-----
From: mohan_tarole at chennai.tcs.co.in
[mailto:mohan_tarole at chennai.tcs.co.in]
Sent: Thursday, August 14, 2003 10:48 AM
To: opencm at armory.com
Subject: [OpenCM] Problem in merging of files


Hi All,

I'm using Continuus V5.1
I'm trying to merge two files (jar files)
I'm selecting the two version to be merged from the history view, 
When I'm pressing the merge button getting following warning, and its 
stopping the merge

"Source Merge Failed. No 'bsite_descriptors' attributes are found on 
XXXX.jar file"

Both the version of the files are in integrate state and belongs to two 
different releases



Thanks and Regards,
Mohan