Hi guys, Someone removed the *.ipr and *.iml files from svn:ignore and committed their *.ipr, *.iml files. Subversion now refuses to svn up because I got local iml files that conflict with the repository iml files. Since IntelliJ can easily synchronize from the maven2 pom.xml files, I don't think it's a good idea to commit those. When not everyone uses the same version of IntelliJ this can be problematic. Also, I explicitly exclude drools-guvnor out of my ipr file to build faster. Can that change be reverted? I believe the old way is better.

It still hasn't been fixed, I still can't update or commit... With kind regards, Geoffrey De Smet Mark Proctor schreef: > mike is to blame, he says he'll fix soon. > > Mark > Geoffrey De Smet wrote: >> Hi guys, >> >> Someone removed the *.ipr and *.iml files from svn:ignore and >> committed their *.ipr, *.iml files. >> Subversion now refuses to svn up because I got local iml files that >> conflict with the repository iml files. >> >> Since IntelliJ can easily synchronize from the maven2 pom.xml files, >> I don't think it's a good idea to commit those. >> When not everyone uses the same version of IntelliJ this can be >> problematic. >> Also, I explicitly exclude drools-guvnor out of my ipr file to build >> faster. >> >> Can that change be reverted? I believe the old way is better. >> > > _______________________________________________ > rules-dev mailing list > rules-dev(a)lists.jboss.org > https://lists.jboss.org/mailman/listinfo/rules-dev > _______________________________________________ rules-dev mailing list rules-dev(a)lists.jboss.org https://lists.jboss.org/mailman/listinfo/rules-dev

Done, It's a bit strange though that the drools-server module has a checked in Eclipse .settings directory. Usually .settings directories contain local stuff. I 'd recommend removing that directory from subversion and adjusting the svn:ignore's to this: target local .metadata .settings .wtpmodules nbproject *.ipr *.iws *.iml With kind regards, Geoffrey De Smet Mark Proctor schreef: > can you delete them yourself? mike buggered off on holiday. > Mark > Geoffrey De Smet wrote: >> It still hasn't been fixed, I still can't update or commit... >> >> With kind regards, >> Geoffrey De Smet >> >> >> Mark Proctor schreef: >>> mike is to blame, he says he'll fix soon. >>> >>> Mark >>> Geoffrey De Smet wrote: >>>> Hi guys, >>>> >>>> Someone removed the *.ipr and *.iml files from svn:ignore and >>>> committed their *.ipr, *.iml files. >>>> Subversion now refuses to svn up because I got local iml files >>>> that conflict with the repository iml files. >>>> >>>> Since IntelliJ can easily synchronize from the maven2 pom.xml >>>> files, I don't think it's a good idea to commit those. >>>> When not everyone uses the same version of IntelliJ this can be >>>> problematic. >>>> Also, I explicitly exclude drools-guvnor out of my ipr file to >>>> build faster. >>>> >>>> Can that change be reverted? I believe the old way is better. >>>> >>> >>> _______________________________________________ >>> rules-dev mailing list >>> rules-dev(a)lists.jboss.org >>> https://lists.jboss.org/mailman/listinfo/rules-dev >>> >> >> _______________________________________________ >> rules-dev mailing list >> rules-dev(a)lists.jboss.org >> https://lists.jboss.org/mailman/listinfo/rules-dev >> > _______________________________________________ > rules-dev mailing list > rules-dev(a)lists.jboss.org > https://lists.jboss.org/mailman/listinfo/rules-dev _______________________________________________ rules-dev mailing list rules-dev(a)lists.jboss.org https://lists.jboss.org/mailman/listinfo/rules-dev