It's all about the answers!

Ask a question

"lscm show conflicts" report "conflicted item xxxxx was not found in outgoing changes"?


Makson Lee (41024141) | asked Feb 11 '14, 5:08 a.m.
retagged Feb 12 '14, 10:21 a.m. by Sonia Dimitrov (27159)
I am trying to accept change and resolve conflicts with lscm command, but the "lscm show conflicts" report that "conflicted item xxxxx was not found in outgoing changes", what does this mean and how to fix it?

Comments
Shashikant Padur commented Feb 11 '14, 6:03 a.m. | edited Feb 11 '14, 6:04 a.m.
JAZZ DEVELOPER
Can you paste the command with the arguments passed to it? What kind of conflict was it? That is what is your change and what is the proposed change?

Makson Lee commented Feb 11 '14, 8:08 p.m. | edited Feb 11 '14, 8:09 p.m.
# lscm show conflicts
Problem running 'show conflicts':Conflicted item "/frameworks/base/packages/SystemUI/tests/src/com/sonymobile" was not found in outgoing changes.




Makson Lee commented Feb 11 '14, 8:13 p.m.

And "lscm show conflicts" should show the kind of conflict, right? But now there is problem running it, so how can i find the information you want?


Makson Lee commented Feb 11 '14, 8:37 p.m. | edited Feb 11 '14, 8:37 p.m.

Here is the output of "lscm show status" command, seems working fine.

# lscm show status -w
Workspace: (1004) "XXXXX" <-> (1005) "XXXXX"  Component: (1002) "XXXXX"    Baseline: (1059) 48 "XXXXX"    Conflicts:      Cc- /frameworks/base/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java (Modified <-> Modified)      Cc- /frameworks/base/packages/SystemUI/tests/AndroidManifest.xml (Modified <-> Modified)      C-- /frameworks/base/packages/SystemUI/tests/src/com/sonymobile (Added <-> Added)      I-- /frameworks/base/packages/SystemUI/tests/src/com/sonymobile/systemui (Unparented <-> Added)









Be the first one to answer this question!


Register or to post your answer.