newbie question- "git pull" complains about *.iml files

I'm both a git and Community Edition newbie.  Why are the *.iml files for Community Edition versioned?  Every time I try to do a pull it complains about my local modifications.  What's the best practice here?

Thanks

4 comments

Hello George,

I'm both a git and Community Edition newbie.  Why are the *.iml files
for Community Edition versioned?  Every time I try to do a pull it
complains about my local modifications.  What's the best practice
here?


Why do you need to perform any modifications to .iml files? They are designed
to be shareable.

--
Dmitry Jemerov
Development Lead
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

Well clearly I'm doing something wrong, as I'm not (explicitly) editing anything, yet I'm ending up with modified *.iml files.  I checked out the project via the command line as per the guidelines at http://www.jetbrains.org/pages/viewpage.action?pageId=983225.  Then, using IDEA 94.273 EAP, I opened the project and did NOTHING ELSE.  After it loaded & indexed everything, I end up with the following:

~/work/community$ git status

# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified:   .idea/compiler.xml
# modified:   .idea/inspectionProfiles/idea_default.xml
# modified:   .idea/inspectionProfiles/idea_default_no_spellchecker.xml
# modified:   .idea/misc.xml
# modified:   .idea/projectCodeStyle.xml
# modified:   RegExpSupport/RegExpSupport.iml
# modified:   build/build.iml
# modified:   community-main.iml
# modified:   community-resources/community-resources.iml
# modified:   images/images.iml
# modified:   java/compiler/forms-compiler/forms-compiler.iml
# modified:   java/compiler/impl/compiler-impl.iml
# modified:   java/compiler/javac2/javac2.iml
# modified:   java/compiler/notNull/notNull.iml
# modified:   java/compiler/openapi/compiler-openapi.iml
# modified:   java/debugger/impl/debugger-impl.iml
# modified:   java/debugger/openapi/debugger-openapi.iml
# modified:   java/execution/impl/execution-impl.iml
# modified:   java/execution/openapi/execution-openapi.iml
# modified:   java/idea-ui/idea-ui.iml
# modified:   java/java-impl/java-impl.iml
# modified:   java/java-runtime/java-runtime.iml
# modified:   java/java-tests/java-tests.iml
# modified:   java/jsp-base-openapi/jsp-base-openapi.iml
# modified:   java/jsp-openapi/jsp-openapi.iml
# modified:   java/jsp-spi/jsp-spi.iml
# modified:   java/openapi/openapi.iml
# modified:   java/testFramework/testFramework-java.iml
# modified:   platform/annotations/annotations.iml
# modified:   platform/boot/boot.iml
# modified:   platform/bootstrap/bootstrap.iml
# modified:   platform/extensions/extensions.iml
# modified:   platform/forms_rt/forms_rt.iml
# modified:   platform/icons/icons.iml
# modified:   platform/lang-api/lang-api.iml
# modified:   platform/lang-impl/lang-impl.iml
# modified:   platform/lvcs-api/lvcs-api.iml
# modified:   platform/lvcs-impl/lvcs-impl.iml
# modified:   platform/platform-api/platform-api.iml
# modified:   platform/platform-impl/platform-impl.iml
# modified:   platform/platform-main/platform-main.iml
# modified:   platform/platform-resources-en/platform-resources-en.iml
# modified:   platform/platform-resources/platform-resources.iml
# modified:   platform/smRunner/smRunner.iml
# modified:   platform/testFramework/testFramework.iml
# modified:   platform/testRunner/testRunner.iml
# modified:   platform/usageView/usageView.iml
# modified:   platform/util/util.iml
# modified:   platform/vcs-api/vcs-api.iml
# modified:   platform/vcs-impl/vcs-impl.iml
# modified:   platform/xdebugger-api/xdebugger-api.iml
# modified:   platform/xdebugger-impl/xdebugger-impl.iml
# modified:   plugins/InspectionGadgets/InspectionGadgetsPlugin.iml
# modified:   plugins/IntelliLang/IntelliLangJava.iml
# modified:   plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml
# modified:   plugins/ant/ant.iml
# modified:   plugins/commander/commander.iml
# modified:   plugins/copyright/copyright.iml
# modified:   plugins/cvs/cvs-core/cvs-core.iml
# modified:   plugins/cvs/cvs-plugin/cvs-plugin.iml
# modified:   plugins/cvs/javacvs-src/javacvs-src.iml
# modified:   plugins/cvs/smartcvs-src/smartcvs-src.iml
# modified:   plugins/devkit/devkit.iml
# modified:   plugins/eclipse/eclipse.iml
# modified:   plugins/generate-tostring/generate-tostring.iml
# modified:   plugins/git4idea/git4idea.iml
# modified:   plugins/groovy/jetgroovy-tests.iml
# modified:   plugins/groovy/jetgroovy.iml
# modified:   plugins/groovy/rt/groovy-rt.iml
# modified:   plugins/java-i18n/java-i18n.iml
# modified:   plugins/junit/junit.iml
# modified:   plugins/junit_rt/junit_rt.iml
# modified:   plugins/maven/maven.iml
# modified:   plugins/properties/properties.iml
# modified:   plugins/spellchecker/spellchecker.iml
# modified:   plugins/svn4idea/svn4idea-tests.iml
# modified:   plugins/svn4idea/svn4idea.iml
# modified:   plugins/testng/testng.iml
# modified:   plugins/testng_rt/testng_rt.iml
# modified:   plugins/ui-designer/ui-designer.iml
# modified:   plugins/xpath/xpath.iml
# modified:   plugins/xpath/xslt-rt/xslt-rt.iml
# modified:   resources-en/resources-en.iml
# modified:   resources/resources.iml
# modified:   xml/dom-impl/dom-impl.iml
# modified:   xml/dom-openapi/dom-openapi.iml
# modified:   xml/impl/xml.iml
# modified:   xml/openapi/xml-openapi.iml
#
no changes added to commit (use "git add" and/or "git commit -a")

0

Hello George,

Could you please look at the diffs for one of the .iml files?

Well clearly I'm doing something wrong, as I'm not (explicitly)
editing anything, yet I'm ending up with modified *.iml files.  I
checked out the project via the command line as per the guidelines at
http://www.jetbrains.org/pages/viewpage.action?pageId=983225.  Then,
using IDEA 94.273 EAP, I opened the project and did NOTHING ELSE.
After it loaded & indexed everything, I end up with the following:

~/work/community$ git status

  1. On branch master

  2. Changed but not updated:

  3.   (use "git add <file>..." to update what will be committed)

  4.   (use "git checkout -- <file>..." to discard changes in working

directory)
#

  1. modified:   .idea/compiler.xml

  2. modified:   .idea/inspectionProfiles/idea_default.xml

  3. modified:

.idea/inspectionProfiles/idea_default_no_spellchecker.xml

  1. modified:   .idea/misc.xml

  2. modified:   .idea/projectCodeStyle.xml

  3. modified:   RegExpSupport/RegExpSupport.iml

  4. modified:   build/build.iml

  5. modified:   community-main.iml

  6. modified:   community-resources/community-resources.iml

  7. modified:   images/images.iml

  8. modified:   java/compiler/forms-compiler/forms-compiler.iml

  9. modified:   java/compiler/impl/compiler-impl.iml

  10. modified:   java/compiler/javac2/javac2.iml

  11. modified:   java/compiler/notNull/notNull.iml

  12. modified:   java/compiler/openapi/compiler-openapi.iml

  13. modified:   java/debugger/impl/debugger-impl.iml

  14. modified:   java/debugger/openapi/debugger-openapi.iml

  15. modified:   java/execution/impl/execution-impl.iml

  16. modified:   java/execution/openapi/execution-openapi.iml

  17. modified:   java/idea-ui/idea-ui.iml

  18. modified:   java/java-impl/java-impl.iml

  19. modified:   java/java-runtime/java-runtime.iml

  20. modified:   java/java-tests/java-tests.iml

  21. modified:   java/jsp-base-openapi/jsp-base-openapi.iml

  22. modified:   java/jsp-openapi/jsp-openapi.iml

  23. modified:   java/jsp-spi/jsp-spi.iml

  24. modified:   java/openapi/openapi.iml

  25. modified:   java/testFramework/testFramework-java.iml

  26. modified:   platform/annotations/annotations.iml

  27. modified:   platform/boot/boot.iml

  28. modified:   platform/bootstrap/bootstrap.iml

  29. modified:   platform/extensions/extensions.iml

  30. modified:   platform/forms_rt/forms_rt.iml

  31. modified:   platform/icons/icons.iml

  32. modified:   platform/lang-api/lang-api.iml

  33. modified:   platform/lang-impl/lang-impl.iml

  34. modified:   platform/lvcs-api/lvcs-api.iml

  35. modified:   platform/lvcs-impl/lvcs-impl.iml

  36. modified:   platform/platform-api/platform-api.iml

  37. modified:   platform/platform-impl/platform-impl.iml

  38. modified:   platform/platform-main/platform-main.iml

  39. modified:   platform/platform-resources-en/platform-resources-en.iml

  40. modified:   platform/platform-resources/platform-resources.iml

  41. modified:   platform/smRunner/smRunner.iml

  42. modified:   platform/testFramework/testFramework.iml

  43. modified:   platform/testRunner/testRunner.iml

  44. modified:   platform/usageView/usageView.iml

  45. modified:   platform/util/util.iml

  46. modified:   platform/vcs-api/vcs-api.iml

  47. modified:   platform/vcs-impl/vcs-impl.iml

  48. modified:   platform/xdebugger-api/xdebugger-api.iml

  49. modified:   platform/xdebugger-impl/xdebugger-impl.iml

  50. modified:   plugins/InspectionGadgets/InspectionGadgetsPlugin.iml

  51. modified:   plugins/IntelliLang/IntelliLangJava.iml

  52. modified:   plugins/IntentionPowerPak/IntentionPowerPackPlugin.iml

  53. modified:   plugins/ant/ant.iml

  54. modified:   plugins/commander/commander.iml

  55. modified:   plugins/copyright/copyright.iml

  56. modified:   plugins/cvs/cvs-core/cvs-core.iml

  57. modified:   plugins/cvs/cvs-plugin/cvs-plugin.iml

  58. modified:   plugins/cvs/javacvs-src/javacvs-src.iml

  59. modified:   plugins/cvs/smartcvs-src/smartcvs-src.iml

  60. modified:   plugins/devkit/devkit.iml

  61. modified:   plugins/eclipse/eclipse.iml

  62. modified:   plugins/generate-tostring/generate-tostring.iml

  63. modified:   plugins/git4idea/git4idea.iml

  64. modified:   plugins/groovy/jetgroovy-tests.iml

  65. modified:   plugins/groovy/jetgroovy.iml

  66. modified:   plugins/groovy/rt/groovy-rt.iml

  67. modified:   plugins/java-i18n/java-i18n.iml

  68. modified:   plugins/junit/junit.iml

  69. modified:   plugins/junit_rt/junit_rt.iml

  70. modified:   plugins/maven/maven.iml

  71. modified:   plugins/properties/properties.iml

  72. modified:   plugins/spellchecker/spellchecker.iml

  73. modified:   plugins/svn4idea/svn4idea-tests.iml

  74. modified:   plugins/svn4idea/svn4idea.iml

  75. modified:   plugins/testng/testng.iml

  76. modified:   plugins/testng_rt/testng_rt.iml

  77. modified:   plugins/ui-designer/ui-designer.iml

  78. modified:   plugins/xpath/xpath.iml

  79. modified:   plugins/xpath/xslt-rt/xslt-rt.iml

  80. modified:   resources-en/resources-en.iml

  81. modified:   resources/resources.iml

  82. modified:   xml/dom-impl/dom-impl.iml

  83. modified:   xml/dom-openapi/dom-openapi.iml

  84. modified:   xml/impl/xml.iml

  85. modified:   xml/openapi/xml-openapi.iml

#
no changes added to commit (use "git add" and/or "git commit -a")
---
Original message URL:
http://www.jetbrains.net/devnet/message/5257525#5257525

--
Dmitry Jemerov
Development Lead
JetBrains, Inc.
http://www.jetbrains.com/
"Develop with Pleasure!"


0

Dmitry,

It was the FindBugs plugin.  I disabled it, did a "git reset --hard HEAD", and now the only local modifications I have are:

~/work/community$ git status
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified:   .idea/compiler.xml
# modified:   .idea/inspectionProfiles/idea_default.xml
# modified:   .idea/inspectionProfiles/idea_default_no_spellchecker.xml
# modified:   .idea/misc.xml
# modified:   .idea/projectCodeStyle.xml



I can now "git pull" without error.

Thanks
0

Please sign in to leave a comment.