Version Control: Integrate Project?

Hello Gordon,

GT> I see this new command in the Version Control menu (I'm using CVS).
GT> What does Integrate Project do? It seems to be some kind of update,
GT> but how does it differ from the Update Project command?

It's a completely different thing - it allows you to integrate your changes
from one branch of the project to another branch.

It's quite broken right now though, unfortunately.

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com
"Develop with pleasure!"

Hmm... I see! To be honest, I don't associate the word "integrate" with version control in any way. You may want to call it something else, like "Merge Branch".

I'll refrain from clicking it until you give the go ahead. :)

Ciao,
Gordon

Hello Gordon,

GT> Hmm... I see! To be honest, I don't associate the word "integrate"
GT> with version control in any way. You may want to call it something
GT> else, like "Merge Branch".

The terminology problems are unfortunately very common in version control
area - for example, do you commit, submit or check in your changes? I think
I've heard some more exotic terms for it as well, like "putback" or something.

"Integrate" is the term used by Perforce.

GT> I'll refrain from clicking it until you give the go ahead. :)

Clicking is OK - the UI mostly works. Just don't try to perform any actual
merges. :)

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com
"Develop with pleasure!"

+The terminology problems are unfortunately very common in version control area - for example, do you commit, submit or check in your changes? I think I've heard some more exotic terms for it as well, like "putback" or something.

"Integrate" is the term used by Perforce.+

I see what you mean. I guess I'm just used to the CVS/Subversion way of things. I've always wondered how feasible it would be to change the various common version control command labels according to which version control system was being used. Although, that would be hard to define when there are different VCS being used for different modules. One really does want the VCS-specific names for some operations though like Subversion's "switch" command, since it's not really an update as such.

Does anybody actually use different VCS for different modules in the same project?

Ciao,
Gordon

Hello Gordon,

GT> Does anybody actually use different VCS for different modules in the
GT> same project?

We do (Perforce for the private stuff, Subversion for open-source plugins).

--
Dmitry Jemerov
Software Developer
JetBrains, Inc.
http://www.jetbrains.com
"Develop with pleasure!"

The terminology problems are unfortunately very
common in version control
area - for example, do you commit, submit or check in
your changes? I think
I've heard some more exotic terms for it as well,
like "putback" or something.

I'd love to see this change according to the project's default version control, instead of choosing one term and sticking with it. I love the way IDEA doesn't try to hide the selected VCS from me, and I hope it stays that way.

Please, please fix !!!! (and Integrate Directory too)