CVS Branching help

Does anybody know how to use the CVS branching functionality?

I had an existing project. I copied the entire project directory and
open the project and created/switched to a new branch. When I checked
in my changes, I was able to see the changes that were checked into the
new branch within my original application when I performed a Check
Project Status.
--

Norris Shelton
Sun Certified Java Programmer

8 comments
Comment actions Permalink

"Norris Shelton" <no_reply@spam.com> schrieb im Newsbeitrag
news:cftivl$poq$1@is.intellij.net...
>Does anybody know how to use the CVS branching functionality?

>I had an existing project. I copied the entire project directory and open
the project and created/switched to a new branch. When I checked in my
changes, I was able to see the changes that were checked into the new branch
within my original application when I performed a Check Project Status.


You have to update your local CVS to the newly created branch before you can
work on that branch.

Greetings

Marc Salm



0
Comment actions Permalink

Here is the update screen:


Would that be by tag?

Marc Salm wrote:

>"Norris Shelton" <no_reply@spam.com> schrieb im Newsbeitrag
>news:cftivl$poq$1@is.intellij.net...

>
>>Does anybody know how to use the CVS branching functionality?
>>
>>
>

>
>>I had an existing project. I copied the entire project directory and open
>>
>>
>the project and created/switched to a new branch. When I checked in my
>changes, I was able to see the changes that were checked into the new branch
>within my original application when I performed a Check Project Status.
>
>
>You have to update your local CVS to the newly created branch before you can
>work on that branch.
>
>Greetings
>
>Marc Salm
>
>
>

>

--

Norris Shelton
Sun Certified Java Programmer



Attachment(s):
moz-screenshot.jpg
0
Comment actions Permalink

Norris Shelton wrote:

Here is the update screen:


Would that be by tag?

Marc Salm wrote:

That would be "by tag", yes.

Note that the branch or tag you have checked out is sticky data, so you shouldn't have "Reset sticky data (-A)" on updates unless
you really need it. That also puts you on MAIN unless you specify a branch.

/Kreiger

0
Comment actions Permalink

In my opinion, the checkout from cvs feature should have an option to specify a tag, so you can checkout a branch into another directory in one step.

This option is already provided in other cvs clients like SmartCVS or WinCVS, so it would be nice to have it integrated here too.

Kind regards

Thomas Gülden
Munich, Germany

0
Comment actions Permalink

Must have done something wrong. I went to my copy of my project and
performed an update (-r) with my tag. I deleted ALL of my files, but one.

Maybe the problem is that I do not know how CVS branching is intended to
be used. I am relying on IntelliJ coaching me through this and it is
not happening.

Christoffer "Kreiger" Hammarström wrote:

Norris Shelton wrote:

>
>> Here is the update screen:
>>
>>
>> Would that be by tag?
>>
>> Marc Salm wrote:
>>

That would be "by tag", yes.

>

Note that the branch or tag you have checked out is sticky data, so
you shouldn't have "Reset sticky data (-A)" on updates unless you
really need it. That also puts you on MAIN unless you specify a branch.

>

/Kreiger



--

Norris Shelton
Sun Certified Java Programmer

0
Comment actions Permalink

I went to my copy of my project and
performed an update (-r) with my tag. I deleted ALL of my files, but one.


And you have created a branch (tag) for ALL of your files, not just the
one, which remained? If not, the current behaviour is expected.

Tom

0
Comment actions Permalink

Doh. OK. Me thinks I need to read the CVS documentation. This doesn't
sound anywhere near intuitive ( at least from an IDE standpoint).

Thomas Singer (MoTJ) wrote:

>> I went to my copy of my project and performed an update (-r) with my
>> tag. I deleted ALL of my files, but one.
>
>

And you have created a branch (tag) for ALL of your files, not just
the one, which remained? If not, the current behaviour is expected.

>

Tom



--

Norris Shelton
Sun Certified Java Programmer

0
Comment actions Permalink

Thomas Gülden wrote:

>In my opinion, the checkout from cvs feature should have an option to specify a tag, so you can checkout a branch into another directory in one step.

>
+1

I noticed this lacking when I needed to write a simple back-ported patch..

0

Please sign in to leave a comment.