Right now we have a couple things in CVS:
the TRUNK - which is the latest development, not really stable, and not
suggested for production use
a v2_2_branch - which contains all work on the 2.2.x direction
and a couple more (v2_1_branch, etc.)
There are things called Tags which allow you to checkout a specific branch at a
specific point in time. We usually put a tag when we make a release. the
RELEASE_2_2_6 tag points to only one possible set of sources. Nothing that is
done in CVS can alter that (except if someone retags using the same tag, which
shouldn't happen).
On the v2_2_branch there is a HEAD version (latest version on the branch) which
contains all fixes/changes since 2.2.6, if you commit some changes to
v2_2_branch they will end up there.
Once we (the release manager for 2.2) figure that it's time for a new release
(either a very important bug has been fixed, or there are a number of
changes/fixes and it's been a while since the last release) a new release is
done. That means a new tag, etc.
So to summarize, you need a checkout of the v2_2_branch and commit your changes
on that branch.
Then they will be included in the next release.
Regards,
Alex
PS: a graphical way of putting things I just said:
http://cvs.linuxcnc.org/cvs/emc2/VERSION?graph=1
----- Original Message -----
From: Chris Morley
To: EMC developers
Sent: Sunday, September 21, 2008 1:02 PM
Subject: Re: [Emc-developers] Bug in classicladder 7.100 EMC 2.2.6
Maybe I don't fully understand but if I commit a change to a release in CVS
doesn't that change it for everyone downloading a release right now?
Classicladder in TRUNK is completely different now.
------------------------------------------------------------------------------
From: [EMAIL PROTECTED]
To: emc-developers@lists.sourceforge.net
Date: Sun, 21 Sep 2008 12:55:04 +0300
Subject: Re: [Emc-developers] Bug in classicladder 7.100 EMC 2.2.6
The fix needs to be in CVS before we release a new version.
At time of release all that is in CVS gets released, nothing more.
Regards,
Alex
----- Original Message -----
From: Chris Morley
To: EMC DEV
Sent: Sunday, September 21, 2008 9:41 AM
Subject: [Emc-developers] Bug in classicladder 7.100 EMC 2.2.6
Hey guys
I found a bug in Classicladder 7.100 that makes it crash when the config
window is closed.
There is a signal to call GetSettings() that calls GetIOSettings() that
looks for info from pages we removed from the config window.
Anyways should I commit a fix or wait till you release a new version of
2.2.X?
This will not effect The trunk version 7.124.
Chris Morley
----------------------------------------------------------------------------
----------------------------------------------------------------------------
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great
prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
----------------------------------------------------------------------------
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
----------------------------------------------------------------------------
No virus found in this incoming message.
Checked by AVG - http://www.avg.com
Version: 8.0.169 / Virus Database: 270.7.0/1682 - Release Date: 20.09.2008
10:24
------------------------------------------------------------------------------
------------------------------------------------------------------------------
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
------------------------------------------------------------------------------
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
------------------------------------------------------------------------------
No virus found in this incoming message.
Checked by AVG - http://www.avg.com
Version: 8.0.169 / Virus Database: 270.7.0/1682 - Release Date: 20.09.2008
10:24
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
