[Swift-devel] swift versions

[Mihael Hategan]

On Tue, 2010-10-05 at 19:40 -0500, Sarah Kenny wrote:
> ok, just want to make sure i fully understand the state of the code:
> 
> these are the most current/stable versions of swift & cog (that which
> we tell users to download):
> 
> swift: branch/1.0
> (https://trac.ci.uchicago.edu/swift/browser/branches/1.0)
> cog: branches/4.1.7
> (http://cogkit.svn.sourceforge.net/viewvc/cogkit/branches/4.1.7/)
> 
> these are the development (less stable) versions of the code that we
> should be committing changes to:
> 
> swift: trunk/ (https://trac.ci.uchicago.edu/swift/browser/trunk)
> cog: trunk/current
> (http://cogkit.svn.sourceforge.net/viewvc/cogkit/trunk/current/)
> 
> assuming that's correct...
> 
> for swift, what are the other/multiple directories under branches/
> that do not appear to be releases or release candidates?
> is the intent, upon the next swift release (whenever that may be) to
> update swift branch/1.0 with the changes that have been committed to
> trunk/ ? 

Right. There are two reasons for doing branches:
1. if some work divergent from trunk is needed
2. to stabilize for a release

For (1), if thinks work out OK, you eventually merge them back into
trunk.

(2)s also get merged back into trunk in one way or another, since they
may contain bug fixes.