[Swift-devel] swift versions

Justin M Wozniak wozniak at mcs.anl.gov
Thu Oct 7 12:51:32 CDT 2010


Yeah, I would like to get the branches (and branched manuals) formed on 
the short term.

On Thu, 7 Oct 2010, Sarah Kenny wrote:

> does the 6 month release time that mihael alluded to seem doable? that is,
> do you think we should shoot for the next release being around the 1st week
> of april 2011?...during which time we would phase out clustering (provided
> we don't get anyone on the user list saying they need it...which i sincerely
> doubt).
>
> ~sk
>
>
> On Thu, Oct 7, 2010 at 11:04 AM, Justin M Wozniak <wozniak at mcs.anl.gov>wrote:
>
>> On Tue, 5 Oct 2010, Mihael Hategan wrote:
>>
>>  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.
>>>
>>> _______________________________________________
>>> Swift-devel mailing list
>>> Swift-devel at ci.uchicago.edu
>>> http://mail.ci.uchicago.edu/mailman/listinfo/swift-devel
>>>
>>
>> So for Swift 1.1, can we have a CoG 4.1.8?
>>
>> --
>> Justin M Wozniak
>>
>

-- 
Justin M Wozniak



More information about the Swift-devel mailing list