Use the Show History command and select the files as before. Verify the same operations can be used on the Synergy Classic client.Clicking on Yes to Merge Trivial Differences and then doing a File -> Save should then automatically display the merged file in the Synergy History window.Clicking the Merge icon in the Synergy History window should also launch DiffMerge.You should be able to view the differences. Verify that the Rational Rhapspody DiffMerge tool is invoked not the default Synergy differencing tool.Click on the Compare icon after using CNTRL and left-click to select the two files.It should invoke the Synergy Java client history:. In Rhapsody, right-click on a file and choose Configuration Management ->History or via Configuration Items click History.Verify DiffMerge invocation from Synergy client: = "C:\\Program Files\\telelogic\\Rhapsody 7.4\\diffmerge.exe" -xcompare "%file1" "%file2" = "C:\\Program Files\\telelogic\\Rhapsody 7.4\\diffmerge.exe" -xmerge "%file1" "%file2" -base "%ancestor" -out "%outfile" If there appears to be an issue with the rhapsodytypes, then specify each file type manually thus: = "C:\\Program Files\\telelogic\\Rhapsody 7.4\\diffmerge.exe" -xcompare "%file1" "%file2" -base "%ancestor" If this fails to invoke the DiffMerge then temporarily enter a hard coded path (one that will find the DiffMerge.exe on the client machine) such as: Note that the ccm.properties file is edited on \etc\ on the server, but the changes will take effect when the Synergy client is restarted, so you should not have to restart the Synergy server. Make sure you put this code into ccm.properties file not into. = DiffMerge.exe -xmerge "%file1" "%file2" -base "%ancestor" -out "%outfile"Įnsure that you modify the C:\\Program Files\\telelogic\\Rhapsody 7.4\\diffmerge.exe to the hard coded path of where DiffMerge.exe is situated on the client machines. = DiffMerge.exe -xcompare "%file1" "%file2" -base "%ancestor" Open the following ccm.properties file on the Synergy client under \etcetera\ and add the following: Modify ccm.properties file on Synergy Client. It also links the Rational Rhapsody DiffMerge tool to perform comparison and merging on Rational Rhapsody files within Rational Synergy. This will create one type definition "rhapsodytypes" with the migrate rules associated with all the Rhapsody file extensions (.cls. On the Synergy server, login as type_developer and import the rhapsodytypes.xml types file (located in the \Share\cm\Synergy).Ĭcm typedef -import rhapsodytypes -dir "directory_path_of_rhapsodytypes.xml_file"
0 Comments
Leave a Reply. |