Upgraded to v8.1.2 build #9852 and merge issue with info.plist

When I upgraded, I guess from v8.1.1, I was told there was a merge issue with info.plist during the process.  So I made a backup copy at that point of info.plist and continued thinking it would overwrite it or present to me a list of specific merge issues like how intellij works with subversion.  But after the upgrade was complete with no more warnings of this, I compared the backed up info.plist with the new one and they are exactly the same.

I had previously modified info.plist to use jdk1.6 with:

and I modified the memory limits:
      <string>-Xms32m -Xmx448m -XX:MaxPermSize=200m -Xbootclasspath/a:../lib/boot.jar -ea</string>

it still shows a previous version:
    <string>IntelliJ IDEA 8.1, build 9732. Copyright JetBrains s.r.o., (c) 2000-2009</string>

so what do I do?  What am I missing?  Things seem to work in intellij...

I'm using this on mac os x 10.5 with an intel core 2 duo cpu.

1 comment
Comment actions Permalink

I just upgraded again now to v8.1.3 build #9886 and I get the same issue.  The update process presents the merge issue to me with only 1 option to deal with it, "IGNORE."  I would really rather not ignore this and fix whatever changes need to be there!  Does anyone have what the info.plist is supposed to look like for the latest IDEA?


Please sign in to leave a comment.