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
