CVS - project and module files

Hi.

I wanted to ask if anybody has some experience with storing the .ipr and .iml files in CVS (or some sort of a source repository)?

I'm having problems with these files when somebody commits a change and I've done some changes as well. Since these things are added to CVS as text files, CVS will try to merge the changes which often results in a conflict and then you have an unusable project or module definition file.

I'm thinking about changing the types of these files to "binary" so CVS won't attempt to merge changes. Does anybody have any experience with this?

Kind regards, Stefan.

3 comments

We do keep .ipr and .iml files in CVS in Aurora project. IMO these files
have enough readable format so one is normally able to make a correct merge.
Also in our team changes to these files are relatively rare and small,
probably this causes that conflicts do not happen often. Also a good idea is
to update project files (and reload project) right before making changes to
the project settings/paths and then commit.

--
Valentin Kipiatkov
JetBrains, Inc
http://www.intellij.com
"Develop with pleasure!"

"Stefan Freyr Stefansson" <stefanf@althingi.is> wrote in message
news:6911242.1069239368657.JavaMail.itn@is.intellij.net...

Hi.

>

I wanted to ask if anybody has some experience with storing the .ipr and

.iml files in CVS (or some sort of a source repository)?
>

I'm having problems with these files when somebody commits a change and

I've done some changes as well. Since these things are added to CVS as text
files, CVS will try to merge the changes which often results in a conflict
and then you have an unusable project or module definition file.
>

I'm thinking about changing the types of these files to "binary" so CVS

won't attempt to merge changes. Does anybody have any experience with this?
>

Kind regards, Stefan.




0

We have been storing these files in CVS since 3.x. In 4.x it works much
better since the ipr is not spammed for every click of the mouse.

However, we do send out an email to the team when a new project file is
checked in so that prior to their next update they are sure to close
idea and get the latest project file(s).

When there are rare conflicts, its usually pretty easy to merge.

0

However, we do send out an email to the team when a new project file is
checked in so that prior to their next update they are sure to close
idea and get the latest project file(s).


You probably noticed that in Aurora when .ipr or .iml file changes IDEA
suggest to reload project in order to take them.

--
Valentin Kipiatkov
JetBrains, Inc
http://www.intellij.com
"Develop with pleasure!"


"Barry Kaplan" <bkaplan@integratedtrading.com> wrote in message
news:bpfsha$e9t$2@is.intellij.net...

We have been storing these files in CVS since 3.x. In 4.x it works much
better since the ipr is not spammed for every click of the mouse.

>

However, we do send out an email to the team when a new project file is
checked in so that prior to their next update they are sure to close
idea and get the latest project file(s).

>

When there are rare conflicts, its usually pretty easy to merge.

>


0

Please sign in to leave a comment.