How to separate stable and unstable versions

[Együd Csaba]

Hi All,
I've a product. I've to implement many new functions but I'd like to
introduce them after I completed. I'd like to separate the stable version
from the development version since may be I will have to make changes on the
stable as well.
Certainly I'd like modifications on the stable version appear in the new
version as well so as I don't have to make the same changes on that too,
while the partially developed new functions should be hidden for the older
version.
How can I do such a thing with CVS?
I use TortoiseCVS 1.4.5, with cvsnt 2.0.4.

Thank you in advance.
Best Regards,

-- Együd Csaba

---
Outgoing mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.528 / Virus Database: 324 - Release Date: 2003. 10. 16.





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How to separate stable and unstable versions

[Matthew . Riechers]

Együd Csaba wrote:
> 
> I'd like to separate the stable version
> from the development version since may be I will have to make changes on the
> stable as well.

One method is to maintain the stable version on a branch, with new
features implemented on the trunk. You can periodically merge bug fixes
from the stable branch to the trunk, and when you want to release your
new features, create a new branch.

See the manual for information on branching:



-Matt


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: How to separate stable and unstable versions

[Együd Csaba]

Hi Matt,
I've made a new branch for my stable version and I'd like to continoue the
development on the 'main trunk' as the doc mentions it. My problem is that
commiting the changes cvs says the following:

--
cvs commit: sticky tag `ver1-1-1-2' for file `source/MainForm.dfm' is not a
branch
cvs commit: sticky tag `ver1-1-1-2' for file `source/MainForm.~pas' is not a
branch
cvs commit: sticky tag `ver1-1-1-2' for file `source/info.dsk' is not a
branch
cvs [commit aborted]: correct above errors first!

Error, CVS operation failed

--

What does it mean and what did I do wrong?

Thank you,
-- Csaba

> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, October 21, 2003 1:52 PM
> To: [EMAIL PROTECTED]
> Cc: [EMAIL PROTECTED]
> Subject: Re: How to separate stable and unstable versions
>
>
> Együd Csaba wrote:
> >
> > I'd like to separate the stable version
> > from the development version since may be I will have to
> make changes on the
> > stable as well.
>
> One method is to maintain the stable version on a branch, with new
> features implemented on the trunk. You can periodically merge
> bug fixes
> from the stable branch to the trunk, and when you want to release your
> new features, create a new branch.
>
> See the manual for information on branching:
>
> <http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs_5.html#SEC54>
>
> -Matt
> ---
> Incoming mail is certified Virus Free.
> Checked by AVG anti-virus system (http://www.grisoft.com).
> Version: 6.0.528 / Virus Database: 324 - Release Date: 2003. 10. 16.
>

> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, October 21, 2003 1:52 PM
> To: [EMAIL PROTECTED]
> Cc: [EMAIL PROTECTED]
> Subject: Re: How to separate stable and unstable versions
>
>
> Együd Csaba wrote:
> >
> > I'd like to separate the stable version
> > from the development version since may be I will have to
> make changes on the
> > stable as well.
>
> One method is to maintain the stable version on a branch, with new
> features implemented on the trunk. You can periodically merge
> bug fixes
> from the stable branch to the trunk, and when you want to release your
> new features, create a new branch.
>
> See the manual for information on branching:
>
> <http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs_5.html#SEC54>
>
> -Matt
> ---
> Incoming mail is certified Virus Free.
> Checked by AVG anti-virus system (http://www.grisoft.com).
> Version: 6.0.528 / Virus Database: 324 - Release Date: 2003. 10. 16.
>

---
Outgoing mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.528 / Virus Database: 324 - Release Date: 2003. 10. 16.





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How to separate stable and unstable versions

[Derek Robert Price]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Együd Csaba wrote:

|Hi Matt,
|I've made a new branch for my stable version and I'd like to continoue the
|development on the 'main trunk' as the doc mentions it. My problem is that
|commiting the changes cvs says the following:
|
|--
|cvs commit: sticky tag `ver1-1-1-2' for file `source/MainForm.dfm' is not a
|branch
As CVS was kind enough to inform you, you are attempting to commit to a
sticky tag and not a branch.  You should read the section on tags:
~

as well as rereading the section on branching:

~

Derek

- --
~*8^)
Email: [EMAIL PROTECTED]

Get CVS support at !
- --
Goldfish don't bounce.
Goldfish don't bounce.
Goldfish don't bounce...
~  - Bart Simpson on chalkboard, _The Simpsons_
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org
iD8DBQE/lUI5LD1OTBfyMaQRAoO7AJwOzu1eqScpRlWx2/qIxO33hk8GRQCfY4SR
wi/ZjoVml7saDAivqzes4x0=
=BJL5
-END PGP SIGNATURE-


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Re: How to separate stable and unstable versions

[Matthew . Riechers]

Együd Csaba wrote:
> 
> Hi Matt,
> I've made a new branch for my stable version and I'd like to continoue the
> development on the 'main trunk' as the doc mentions it. My problem is that
> commiting the changes cvs says the following:
> 
> --
> cvs commit: sticky tag `ver1-1-1-2' for file `source/MainForm.dfm' is not a
> branch

You need to move to the branch first, with something like:

cvs up -r my_branch_name

-Matt


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

RE: How to separate stable and unstable versions

[Együd Csaba]

Hi,
I think it has been solved by updating cvs path. The old PATH pointed to the
cvs version 1.11.5. The new one points to the expected 2.0.4.
My project now seems to be working fine. I can checkout and commit different
versions.
When I select Branch... menuitem from TortoiceCVS menu TortoiceCVS runs
   cvs -b -c v1-1-1
Should it add the release as well?

-- Csaba

> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]
> Sent: Tuesday, October 21, 2003 3:52 PM
> To: [EMAIL PROTECTED]
> Subject: Re: How to separate stable and unstable versions
>
>
> Együd Csaba wrote:
> >
> > Hi Matt,
> > I've made a new branch for my stable version and I'd like
> to continoue the
> > development on the 'main trunk' as the doc mentions it. My
> problem is that
> > commiting the changes cvs says the following:
> >
> --
> --
> > --
> > cvs commit: sticky tag `ver1-1-1-2' for file
> `source/MainForm.dfm' is not a
> > branch
>
> You created a tag, not a branch. It is good to use a tag to "anchor" a
> branch, but now you need to create a branch with the '-b'
> option to 'cvs
> tag'. The following would create a branch based on 'ver1-1-1-2':
>
>   cvs tag -b -r ver1-1-1-2 ver1-1-1-2-branch
>
> Note that it may be more useful to name the branch based on a
> higher-level rev, like 1-1-1 vs. 1-1-1-2; you could then tag
> the branch
> as 1-1-1-x if you wanted to make a bug fix release. Adjust the above
> accordingly.
>
> -Matt
> ---
> Incoming mail is certified Virus Free.
> Checked by AVG anti-virus system (http://www.grisoft.com).
> Version: 6.0.528 / Virus Database: 324 - Release Date: 2003. 10. 16.
>

---
Outgoing mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.528 / Virus Database: 324 - Release Date: 2003. 10. 16.





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs