CVS Trunk and Branch development

Hi all,

Our development team is using CVS (via Intellij). Recently I've created a branch within CVS using Intellij. I have to develop both in the trunk and in the branch. Therefore, I have two Intellij windows open: The first Intellij window is opened with my existing project (which is the trunk). In the second Intellij window I've created a new project and checked out, from CVS, the code from the new branch.  When I commit a file in my second Intellij window, the changes are committed to the branch (which I can see from the revision numbers). This is working fine and is exactly what I want. However, when I commit changes in my first Intellij window (which represents code from the trunk), the commit is made not against the trunk, but against the branch (as indicated by the revision numbers). My question is, using Intellij, how can I make my commits against the trunk and not the branch?

I'm using Intellij version 7.0.  Thanks in advance!

1 comment
Comment actions Permalink

I Kam wrote:

Hi all,

Our development team is using CVS (via Intellij). Recently I've
created a branch within CVS using Intellij. I have to develop both in
the trunk and in the branch. Therefore, I have two Intellij windows
open: The first Intellij window is opened with my existing project
(which is the trunk). In the second Intellij window I've created a
new project and checked out, from CVS, the code from the new branch.
When I commit a file in my second Intellij window, the changes are
committed to the branch (which I can see from the revision numbers).
This is working fine and is exactly what I want. However, when I
commit changes in my first Intellij window (which represents code
from the trunk), the commit is made not against the trunk, but
against the branch (as indicated by the revision numbers). My
question is, using Intellij, how can I make my commits against the
trunk and not the branch?

I'm using Intellij version 7.0.  Thanks in advance!

--- Original message URL:
http://www.jetbrains.net/devnet/message/5244717#5244717

The changes you commit will go into the branch that the code was
originally checked out from - there is no way to specify the branch that
a file should be committed into in Idea.

Check that the code you have in your trunk sandbox is actually the
trunk version - if you do a CVS|Show History on a file in the trunk
sandbox the bold line should show a file with version 1.x, and not 1.x.x.x

N.

0

Please sign in to leave a comment.