Version Control Local Changes list shows Perforce changelists that aren't mine
We just created a new branch in Perforce this week, and I have just created a new workspace for it. As part of setting up IDEA, I have created 2 Perforce changelists: #885447 and #885449. However, the Version Control -> Local Changes tab is showing me 11 changelists- my 2, plus 9 others (not counting the Default, of course):
What's really weird is that I turned on the setting in IDEA to log Perforce commands to a file, and it's running the correct Perforce command and getting back the correct changelists:
17:09:32 changes -i -t -l -s pending -u {my_username} -c {my_client}
17:09:33
ErrCode=0
StdOut:------------
Change 885449 on 2018/08/14 16:14:28 by {my_username@{my_client} *pending*
{name_of_this_changelist}
Change 885447 on 2018/08/14 16:10:37 by {my_username@{my_client} *pending*
{name_of_this_changelist}
StdErr:------------
End----------------
In fact, the names of the other changelists don't appear in the p4 output file at all.
I followed the instructions at http://devnet.jetbrains.com/message/5519308#5519308 to invalidate and clear the VCS cache, but it didn't solve the problem. Anyone ever run into this and/or have any ideas?
Please sign in to leave a comment.
IntelliJ uses its own changelsits, see https://www.jetbrains.com/help/idea/managing-changelists.html
They get synced with Perforce - and for those that are synced, you can see Perforce changelist number specified.
Others are just local to IDE. You could safely delete them.
Not sure where they come from though, if not Perforce. If you have not created them manually, they should not appear when Perforce is in use.
A coworker just found it - they were listed in workspace.xml, and someone had checked it in with their own list in there.
We've had problems similar to this before, where we want to have the basic project-related files checked in to make it easy for new users to get set up, but we then end up with some developer-specific stuff spreading around. Is there a guide somewhere to best practices around what lives in which project files, and which ones to check into source control?
Yep, workspace.xml should not be checked-in, exactly because it stores user and pc-specific data.
See https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
That's exactly what I"m looking for. Thanks!