It's all about the answers!

Ask a question

lscm conflicts


Yehiel Glass (25538986) | asked Dec 15 '11, 11:44 a.m.
retagged Jun 04 '12, 10:10 a.m. by Evan Hughes (2.4k1318)
Hi,

I deleted a file in my workspace, while other user edited this file and delivered it to the stream.
My workspace has conflict. The files was checked in by checking in it's folder, but after Accept action, I can't resolve the conflict because the file doesn't exist and I can't give the command: lscm resolve -c <file>
I saw that there is possibility to resolve with the component, but I need example to understand how to run the command.
* I don't want to resolve the conflict from eclipse client because it's a script.

Need your help,
Yehiel

2 answers



permanent link
Sridevi Sangaiah (59179) | answered Jun 11 '12, 2:09 a.m.
JAZZ DEVELOPER
Hi,

'lscm resolve' command accepts UUID of the file also. One of the ways to determine the UUID is to run 'lscm -u y status -C -v -w -I", which would display the file along with its UUID. UUID of the file can be extracted by parsing the output of the status command in the script.

Thanks,
Sridevi



Comments
Shashikant Padur commented Jun 11 '12, 8:11 a.m. | edited Jun 11 '12, 8:11 a.m.
JAZZ DEVELOPER

'lscm resolve' does not accept UUID in 3.x or earlier versions. You need to enter the file path relative to the component.


permanent link
Yehiel Glass (25538986) | answered Jul 05 '12, 3:48 a.m.
RTC 4 has a fix for this problem.

Your answer


Register or to post your answer.